From 9e881880c87cb146fcfee62886ef4b7feaa87cb8 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 22 Oct 2020 19:07:32 +0530 Subject: [PATCH] Fairoj : minor issues and copyright year text changes --- .../pd-questions/capture-btn/capture-btn.component.ts | 9 +++++++-- .../pd-questions/common-ques/common-ques.component.scss | 3 ++- .../employer-info/employer-info.component.html | 2 +- .../employer-info/employer-info.component.scss | 3 ++- .../list-pd/schedule-pd/schedule-pd.component.scss | 4 ++-- .../manage-pd/list-pd/view-pd/view-pd.component.ts | 4 +++- ng6-seed/src/app/session/login/login-component.html | 2 +- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/capture-btn/capture-btn.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/capture-btn/capture-btn.component.ts index 0a41019..ea81726 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/capture-btn/capture-btn.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/capture-btn/capture-btn.component.ts @@ -1,4 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { LoaderService } from 'app/shared/loaderService/loader.service'; import { Ng2ImgMaxService } from 'ng2-img-max'; @Component({ @@ -10,7 +11,7 @@ export class CaptureBtnComponent implements OnInit { @Input() addMoreBtn; @Output() imageDataEmitter = new EventEmitter - constructor(private ng2ImgMax:Ng2ImgMaxService) { } + constructor(private ng2ImgMax:Ng2ImgMaxService,private loaderService:LoaderService) { } ngOnInit(): void { console.log(this.addMoreBtn) @@ -18,15 +19,19 @@ export class CaptureBtnComponent implements OnInit { capturedImage(event){ console.log(event); let imageData= event.target.files[0] + this.loaderService.showMatSpinnerDialog(); + if(imageData) { this.ng2ImgMax.resizeImage(imageData, 450, 650).subscribe( result => { + this.loaderService.closeMatSpinnerDialog(); this.imageDataEmitter.emit(result) }, error => { console.log('😢 Oh no!', error); + this.loaderService.closeMatSpinnerDialog(); } ); - + } } capture(event){ event.preventDefault(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/common-ques/common-ques.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/common-ques/common-ques.component.scss index 37ca2cc..50677ec 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/common-ques/common-ques.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/common-ques/common-ques.component.scss @@ -12,12 +12,13 @@ // } - ::ng-deep .mat-dialog-container{ + ::ng-deep{ .no-padding > .mat-dialog-container{ @media (max-width: 768px) { padding: 0px !important; will-change: transform, opacity; } } +} .mat-button, .mat-raised-button{ background-color: #e24533; color: white; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/employer-info/employer-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/employer-info/employer-info.component.html index b7aab9b..c1f3f61 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/employer-info/employer-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/employer-info/employer-info.component.html @@ -618,7 +618,7 @@ fill="clear"> Capture the Image --> -Required +Required diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/employer-info/employer-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/employer-info/employer-info.component.scss index 87dadf7..9caa151 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/employer-info/employer-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/employer-info/employer-info.component.scss @@ -52,10 +52,11 @@ // margin-top: 16px; width: 100%; } -::ng-deep .mat-dialog-container{ +::ng-deep{ .no-padding > .mat-dialog-container{ @media (max-width: 768px) { padding: 0px !important; } +} } .whole_form { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.scss index e9c7242..e634637 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.scss @@ -1,9 +1,9 @@ .mat-list-item-content,.mat-list-base{ padding:0px !important; } -::ng-deep .mat-dialog-container{ +::ng-deep{ .no-padding > .mat-dialog-container{ @media (max-width: 768px) { padding: 0px !important; - // will-change: transform, opacity; } + } } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index f959568..da6bca0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -326,7 +326,8 @@ export class ViewPdComponent implements OnInit, OnDestroy { pdData.pd_id = childData.assigned_pd; const dialogSchedule = this.dialog.open(SchedulePdComponent, { data: pdData, - disableClose: true + disableClose: true, + panelClass:'no-padding' }); dialogSchedule.afterClosed() .subscribe(dataresult => { @@ -432,6 +433,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { width: '100%', disableClose: false, closeOnNavigation:true, + panelClass:'no-padding' }); dialogRef.afterClosed() .subscribe(dataresult => { diff --git a/ng6-seed/src/app/session/login/login-component.html b/ng6-seed/src/app/session/login/login-component.html index e03f910..77f02d7 100755 --- a/ng6-seed/src/app/session/login/login-component.html +++ b/ng6-seed/src/app/session/login/login-component.html @@ -42,7 +42,7 @@