From 690517eae65232daf79d3249285893acb04dce06 Mon Sep 17 00:00:00 2001 From: "surendar.m@watermelon.us" Date: Wed, 12 Apr 2023 17:29:35 +0530 Subject: [PATCH] image size validation --- .../appoinments-list.component.html | 2 +- .../appoinments-list.component.scss | 7 +- .../add-business/add-business.component.html | 19 +- .../add-business/add-business.component.scss | 7 + .../add-business/add-business.component.ts | 28 +-- .../business-list.component.html | 2 +- .../business-list.component.scss | 15 +- .../business-list/business-list.component.ts | 4 +- .../customers-list.component.html | 2 +- .../customers-list.component.scss | 11 +- .../service-list/service-list.component.html | 2 +- .../service-list/service-list.component.scss | 11 +- .../user/add-user/add-user.component.html | 10 +- .../user/add-user/add-user.component.scss | 8 + .../user/add-user/add-user.component.ts | 168 +++++++++--------- .../user/user-list/user-list.component.html | 2 +- .../user/user-list/user-list.component.scss | 15 +- ng-seed/src/environments/environment.ts | 4 +- 18 files changed, 186 insertions(+), 131 deletions(-) diff --git a/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.html b/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.html index e09ef95..38cae88 100644 --- a/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.html +++ b/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.html @@ -70,7 +70,7 @@ Action edit - delete + delete diff --git a/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.scss b/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.scss index 5047ace..f7d8378 100644 --- a/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.scss +++ b/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.scss @@ -50,13 +50,16 @@ tr.mat-header-row { font-size: 14px; } .edit-color{ - color: rgba(0, 0, 0, 0.54); + color: #178a78; +} +.edit-color2{ + color: #e12929ba; } .edit-color:hover { color: #4caf50; } .delete:hover { - color:#ff0000; + color:#ff000085; } // ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper { // width: 180%; diff --git a/ng-seed/src/app/appoinment/business/add-business/add-business.component.html b/ng-seed/src/app/appoinment/business/add-business/add-business.component.html index d6d0829..24b4c91 100644 --- a/ng-seed/src/app/appoinment/business/add-business/add-business.component.html +++ b/ng-seed/src/app/appoinment/business/add-business/add-business.component.html @@ -49,21 +49,30 @@ Working Hrs is required Limit exceed --> -
- - Add Admin +
+
+ +
+
+ Upload Below 2MB +
+
+ Add Admin +
+
+ Sure to delete {{local_data.name}}? - +
- + \ No newline at end of file diff --git a/ng-seed/src/app/appoinment/business/add-business/add-business.component.scss b/ng-seed/src/app/appoinment/business/add-business/add-business.component.scss index add3369..28d3bbb 100644 --- a/ng-seed/src/app/appoinment/business/add-business/add-business.component.scss +++ b/ng-seed/src/app/appoinment/business/add-business/add-business.component.scss @@ -75,4 +75,11 @@ input[type=file]::file-selector-button { input[type=file]::file-selector-button:hover { background: #0d45a5; + } + .image{ + border: 7px solid #16c1a636; + } + .imgSizeValidation{ + color: red; + font-family: ui-serif; } \ No newline at end of file diff --git a/ng-seed/src/app/appoinment/business/add-business/add-business.component.ts b/ng-seed/src/app/appoinment/business/add-business/add-business.component.ts index 60e474b..9f9ba0c 100644 --- a/ng-seed/src/app/appoinment/business/add-business/add-business.component.ts +++ b/ng-seed/src/app/appoinment/business/add-business/add-business.component.ts @@ -3,6 +3,8 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { MatCheckboxChange } from '@angular/material/checkbox'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Router } from '@angular/router'; +import { NotifierService } from 'angular-notifier'; +import { environment } from 'environments/environment'; export interface UsersData { name: string; id: number; @@ -25,7 +27,8 @@ export class AddBusinessComponent implements OnInit { formData: any=[]; selectedFiles: any; currentFileUpload: any; - constructor(private router: Router,private formBuilder: FormBuilder, + private apiUrl = environment.apiEndpoint; + constructor(private notifierService: NotifierService,private router: Router,private formBuilder: FormBuilder, public dialogRef: MatDialogRef, @Optional() @Inject(MAT_DIALOG_DATA) public data: UsersData) { console.log(data); @@ -46,13 +49,15 @@ export class AddBusinessComponent implements OnInit { this.dialogRef.close({event:'Cancel'}); } onSelectFile(event) { + console.log(event) console.log(event.target.files[0]) - const file = event.target.files[0]; - + if(event.target.files[0].size > 2097152){ + this.notifierService.notify('warning', 'Image size is too Larger'); + }else { + const file = event.target.files[0]; if(event != null){ this.imageViewStatus = true - } - + } this.form['value'].logo = [event.target.files[0]] if (event.target.files && event.target.files[0]) { var reader = new FileReader(); @@ -63,11 +68,9 @@ export class AddBusinessComponent implements OnInit { } } // this.formData=[]; - this.formData.append('image', file, file.name); - - console.log(this.currentFileUpload) - - + this.formData.append('image', file, file.name); + console.log(this.currentFileUpload) + } // this.formData.append('file', file, file.name); } @@ -126,4 +129,9 @@ export class AddBusinessComponent implements OnInit { // console.log(this.action,this.local_data) } + image_view(image){ + + return this.apiUrl+'imageViewer?img_name='+image; + } + } diff --git a/ng-seed/src/app/appoinment/business/business-list/business-list.component.html b/ng-seed/src/app/appoinment/business/business-list/business-list.component.html index 61d1873..75612d5 100644 --- a/ng-seed/src/app/appoinment/business/business-list/business-list.component.html +++ b/ng-seed/src/app/appoinment/business/business-list/business-list.component.html @@ -59,7 +59,7 @@ Action edit - delete + delete diff --git a/ng-seed/src/app/appoinment/business/business-list/business-list.component.scss b/ng-seed/src/app/appoinment/business/business-list/business-list.component.scss index 862467b..5b59187 100644 --- a/ng-seed/src/app/appoinment/business/business-list/business-list.component.scss +++ b/ng-seed/src/app/appoinment/business/business-list/business-list.component.scss @@ -50,14 +50,17 @@ img { font-size: 14px; } .edit-color{ - color: rgba(0, 0, 0, 0.54); + color: #178a78; +} +.edit-color2{ + color: #e12929ba; } .edit-color:hover { - color: #4caf50; - } - .delete:hover { - color:#ff0000; - } + color: #4caf50; +} +.delete:hover { + color:#ff000085; +} // ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper { // width: 180%; // } diff --git a/ng-seed/src/app/appoinment/business/business-list/business-list.component.ts b/ng-seed/src/app/appoinment/business/business-list/business-list.component.ts index 641d935..f9e7d16 100644 --- a/ng-seed/src/app/appoinment/business/business-list/business-list.component.ts +++ b/ng-seed/src/app/appoinment/business/business-list/business-list.component.ts @@ -186,11 +186,11 @@ export class BusinessListComponent implements OnInit { //console.log(formData) this._bus.addFormDetails(formValue[0]).subscribe(res => { if (res.status == 200) { - // this.customersList = res.data; + let getData = res.data; this.getBusinessList() if(result.event == 'Add' && result.admincheck == true){ localStorage.setItem('go_admin','0') - localStorage.setItem('busName',row_obj.busName) + localStorage.setItem('busNameID',getData.busId) this.router.navigate(['/users',]) } if(result.event == 'Add'){ diff --git a/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.html b/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.html index 6e5065c..05e9c29 100644 --- a/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.html +++ b/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.html @@ -58,7 +58,7 @@ Action edit - delete + delete diff --git a/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.scss b/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.scss index 8a3bf62..8647bc6 100644 --- a/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.scss +++ b/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.scss @@ -48,13 +48,16 @@ img { font-size: 14px; } .edit-color{ - color: rgba(0, 0, 0, 0.54); -} -.edit-color:hover { + color: #178a78; + } + .edit-color2{ + color: #e12929ba; + } + .edit-color:hover { color: #4caf50; } .delete:hover { - color:#ff0000; + color:#ff000085; } // ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper { // width: 180%; diff --git a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.html b/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.html index 29772b9..9d95509 100644 --- a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.html +++ b/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.html @@ -46,7 +46,7 @@ Action edit - delete + delete diff --git a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.scss b/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.scss index 3cf4220..a440109 100644 --- a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.scss +++ b/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.scss @@ -50,13 +50,16 @@ img { font-size: 14px; } .edit-color{ - color: rgba(0, 0, 0, 0.54); -} -.edit-color:hover { + color: #178a78; + } + .edit-color2{ + color: #e12929ba; + } + .edit-color:hover { color: #4caf50; } .delete:hover { - color:#ff0000; + color:#ff000085; } // ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper { // width: 180%; diff --git a/ng-seed/src/app/appoinment/user/add-user/add-user.component.html b/ng-seed/src/app/appoinment/user/add-user/add-user.component.html index 0af0936..4e8d2e5 100644 --- a/ng-seed/src/app/appoinment/user/add-user/add-user.component.html +++ b/ng-seed/src/app/appoinment/user/add-user/add-user.component.html @@ -64,9 +64,11 @@ Password is required Limit exceed - - - + + +
+
+ Upload Below 2MB