From 6b9b7dbf3df297fcc23ddb1e12d6dad0d9aaf0b5 Mon Sep 17 00:00:00 2001 From: "surendar.m@watermelon.us" Date: Thu, 23 Mar 2023 10:21:58 +0530 Subject: [PATCH] end user --- ng-seed/package-lock.json | 79 ++-- ng-seed/package.json | 1 + ng-seed/src/app/app.routing.ts | 8 +- .../appoinment/appoinment-routing.module.ts | 10 +- .../src/app/appoinment/appoinment.module.ts | 13 +- .../appoinments-list.component.scss | 16 +- .../dialog-box/dialog-box.component.scss | 8 +- .../business-list.component.scss | 16 +- .../business-list/business-list.component.ts | 15 +- .../dialog-box/dialog-box.component.html | 4 +- .../dialog-box/dialog-box.component.ts | 22 +- .../consultants/consultants-routing.module.ts | 16 - .../consultants/consultants.module.ts | 25 -- .../customers-list.component.scss | 18 +- .../api-service.service.ts | 34 -- .../service-list-routing.module.ts | 16 - .../service-list.module.ts | 22 -- .../service-list/service-list.component.html | 26 -- .../user-dialog-box.component.html | 35 +- .../user-dialog-box.component.ts | 8 +- .../user/user-list/user-list.component.html | 12 +- .../user/user-list/user-list.component.scss | 16 +- .../user/user-list/user-list.component.ts | 13 +- .../centers-list.component.html | 71 ++++ .../centers-list.component.scss | 120 ++++++ .../centers-list.component.spec.ts | 25 ++ .../centers-list.component.ts | 28 ++ .../consultants-details.component.html | 0 .../consultants-details.component.scss | 6 +- .../consultants-details.component.spec.ts | 0 .../consultants-details.component.ts | 0 .../consultants-list.component.html | 16 +- .../consultants-list.component.scss | 14 +- .../consultants-list.component.spec.ts | 0 .../consultants-list.component.ts | 8 +- .../app/end-user/end-user-routing.module.ts | 53 +++ ng-seed/src/app/end-user/end-user.module.ts | 35 ++ .../end-user.service.spec.ts} | 8 +- ng-seed/src/app/end-user/end-user.service.ts | 9 + .../search-category.component.html | 220 +++++++++++ .../search-category.component.scss | 364 ++++++++++++++++++ .../search-category.component.spec.ts | 25 ++ .../search-category.component.ts | 150 ++++++++ .../dialog-box/dialog-box.component.html | 0 .../dialog-box/dialog-box.component.scss | 0 .../dialog-box/dialog-box.component.spec.ts | 0 .../dialog-box/dialog-box.component.ts | 0 .../service-list.component.html | 36 ++ .../service-list.component.scss | 18 +- .../service-list.component.spec.ts | 0 .../service-list.component.ts | 2 + .../slot-booking-details.component.html | 92 +++++ .../slot-booking-details.component.scss | 49 +++ .../slot-booking-details.component.spec.ts | 25 ++ .../slot-booking-details.component.ts | 44 +++ .../src/app/layouts/role-menu-items.pipe.ts | 5 +- .../src/app/session/otp/otp.component.html | 67 +++- .../src/app/session/otp/otp.component.scss | 6 +- ng-seed/src/app/session/otp/otp.component.ts | 5 + .../menu-items/horizontal-menu-items.ts | 18 + .../src/app/shared/menu-items/menu-items.ts | 18 + .../shared/pipe/search-filter.pipe.spec.ts | 8 + .../src/app/shared/pipe/search-filter.pipe.ts | 27 ++ ng-seed/src/app/shared/shared.module.ts | 7 +- .../assets/styles/scss/_app.variables.scss | 2 +- 65 files changed, 1680 insertions(+), 334 deletions(-) delete mode 100644 ng-seed/src/app/appoinment/consultants/consultants-routing.module.ts delete mode 100644 ng-seed/src/app/appoinment/consultants/consultants.module.ts delete mode 100644 ng-seed/src/app/appoinment/service-list-details/service-api-services/api-service.service.ts delete mode 100644 ng-seed/src/app/appoinment/service-list-details/service-list-routing.module.ts delete mode 100644 ng-seed/src/app/appoinment/service-list-details/service-list.module.ts delete mode 100644 ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.html create mode 100644 ng-seed/src/app/end-user/business-centers/centers-list.component.html create mode 100644 ng-seed/src/app/end-user/business-centers/centers-list.component.scss create mode 100644 ng-seed/src/app/end-user/business-centers/centers-list.component.spec.ts create mode 100644 ng-seed/src/app/end-user/business-centers/centers-list.component.ts rename ng-seed/src/app/{appoinment => end-user}/consultants/consultants-details/consultants-details.component.html (100%) rename ng-seed/src/app/{appoinment => end-user}/consultants/consultants-details/consultants-details.component.scss (90%) rename ng-seed/src/app/{appoinment => end-user}/consultants/consultants-details/consultants-details.component.spec.ts (100%) rename ng-seed/src/app/{appoinment => end-user}/consultants/consultants-details/consultants-details.component.ts (100%) rename ng-seed/src/app/{appoinment/consultants/consultants-list => end-user/consultants}/consultants-list.component.html (76%) rename ng-seed/src/app/{appoinment/consultants/consultants-list => end-user/consultants}/consultants-list.component.scss (91%) rename ng-seed/src/app/{appoinment/consultants/consultants-list => end-user/consultants}/consultants-list.component.spec.ts (100%) rename ng-seed/src/app/{appoinment/consultants/consultants-list => end-user/consultants}/consultants-list.component.ts (93%) create mode 100644 ng-seed/src/app/end-user/end-user-routing.module.ts create mode 100644 ng-seed/src/app/end-user/end-user.module.ts rename ng-seed/src/app/{appoinment/service-list-details/service-api-services/api-service.service.spec.ts => end-user/end-user.service.spec.ts} (52%) create mode 100644 ng-seed/src/app/end-user/end-user.service.ts create mode 100644 ng-seed/src/app/end-user/search-category/search-category.component.html create mode 100644 ng-seed/src/app/end-user/search-category/search-category.component.scss create mode 100644 ng-seed/src/app/end-user/search-category/search-category.component.spec.ts create mode 100644 ng-seed/src/app/end-user/search-category/search-category.component.ts rename ng-seed/src/app/{appoinment => end-user}/service-list-details/dialog-box/dialog-box.component.html (100%) rename ng-seed/src/app/{appoinment => end-user}/service-list-details/dialog-box/dialog-box.component.scss (100%) rename ng-seed/src/app/{appoinment => end-user}/service-list-details/dialog-box/dialog-box.component.spec.ts (100%) rename ng-seed/src/app/{appoinment => end-user}/service-list-details/dialog-box/dialog-box.component.ts (100%) create mode 100644 ng-seed/src/app/end-user/service-list-details/service-list.component.html rename ng-seed/src/app/{appoinment/service-list-details/service-list => end-user/service-list-details}/service-list.component.scss (87%) rename ng-seed/src/app/{appoinment/service-list-details/service-list => end-user/service-list-details}/service-list.component.spec.ts (100%) rename ng-seed/src/app/{appoinment/service-list-details/service-list => end-user/service-list-details}/service-list.component.ts (99%) create mode 100644 ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.html create mode 100644 ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.scss create mode 100644 ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.spec.ts create mode 100644 ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.ts create mode 100644 ng-seed/src/app/shared/pipe/search-filter.pipe.spec.ts create mode 100644 ng-seed/src/app/shared/pipe/search-filter.pipe.ts diff --git a/ng-seed/package-lock.json b/ng-seed/package-lock.json index 409142e..3afdb70 100644 --- a/ng-seed/package-lock.json +++ b/ng-seed/package-lock.json @@ -305,6 +305,30 @@ "tslib": "^1.9.0" } }, + "sass-loader": { + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.1.1.tgz", + "integrity": "sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw==", + "dev": true, + "requires": { + "klona": "^2.0.4", + "loader-utils": "^2.0.0", + "neo-async": "^2.6.2", + "schema-utils": "^3.0.0", + "semver": "^7.3.2" + } + }, + "schema-utils": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", + "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + } + }, "semver": { "version": "7.3.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", @@ -8224,8 +8248,7 @@ "klona": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", - "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", - "dev": true + "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==" }, "leaflet": { "version": "1.9.3", @@ -9147,8 +9170,7 @@ "neo-async": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "ng2-charts": { "version": "2.4.3", @@ -12077,53 +12099,12 @@ } }, "sass-loader": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.1.1.tgz", - "integrity": "sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw==", - "dev": true, + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz", + "integrity": "sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==", "requires": { "klona": "^2.0.4", - "loader-utils": "^2.0.0", - "neo-async": "^2.6.2", - "schema-utils": "^3.0.0", - "semver": "^7.3.2" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - } - }, - "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } + "neo-async": "^2.6.2" } }, "saucelabs": { diff --git a/ng-seed/package.json b/ng-seed/package.json index 44a5ab6..8c657c4 100644 --- a/ng-seed/package.json +++ b/ng-seed/package.json @@ -57,6 +57,7 @@ "quill": "^1.3.7", "rxjs": "^6.6.6", "rxjs-compat": "^6.6.6", + "sass-loader": "^13.2.0", "screenfull": "^5.1.0", "simple-line-icons": "^2.5.5", "sortablejs": "^1.13.0", diff --git a/ng-seed/src/app/app.routing.ts b/ng-seed/src/app/app.routing.ts index fc34e3f..76842bc 100644 --- a/ng-seed/src/app/app.routing.ts +++ b/ng-seed/src/app/app.routing.ts @@ -32,20 +32,14 @@ export const AppRoutes: Routes = [{ loadChildren: () => import('./appoinment/customers/customers.module').then(m => m.CustomersModule) }, { - path: 'consultants', - loadChildren: () => import('./appoinment/consultants/consultants.module').then(m => m.ConsultantsModule) - }, { path: 'users', loadChildren: () => import('./appoinment/user/user.module').then(m => m.UserModule) }, - { - path: 'services', - loadChildren: () => import('./appoinment/service-list-details/service-list.module').then(m => m.ServiceListModule) - }, { path: 'consultant-setting', loadChildren: () => import('./appoinment/consultant-setting/consultant-setting.module').then(m => m.ConsultantSettingModule) }, + ] }, { diff --git a/ng-seed/src/app/appoinment/appoinment-routing.module.ts b/ng-seed/src/app/appoinment/appoinment-routing.module.ts index beb003e..3f746e3 100644 --- a/ng-seed/src/app/appoinment/appoinment-routing.module.ts +++ b/ng-seed/src/app/appoinment/appoinment-routing.module.ts @@ -1,15 +1,7 @@ import { Component, NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { AppoinmentsListComponent } from './appoinments/appoinments-list/appoinments-list.component'; -import { AddBusinessListComponent } from './business/add-business-list/add-business-list.component'; -import { BusinessListComponent } from './business/business-list/business-list.component'; -import { CalendarListComponent } from './calendars/calendar-list/calendar-list.component'; -import { CustomersListComponent } from './customers/customers-list/customers-list.component'; -import { ServiceListComponent } from './service-list-details/service-list/service-list.component'; -import { AddUserListComponent } from './user/add-user-list/add-user-list.component'; +import { AddBusinessListComponent } from './business/add-business-list/add-business-list.component'; import { UserListComponent } from './user/user-list/user-list.component'; -import { } from './service-list-details/service-list/service-list.component' -import { ConsultantsListComponent } from './consultants/consultants-list/consultants-list.component'; const routes: Routes = [ { diff --git a/ng-seed/src/app/appoinment/appoinment.module.ts b/ng-seed/src/app/appoinment/appoinment.module.ts index ede9e9d..f1e1b07 100644 --- a/ng-seed/src/app/appoinment/appoinment.module.ts +++ b/ng-seed/src/app/appoinment/appoinment.module.ts @@ -1,16 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { AppoinmentRoutingModule } from './appoinment-routing.module'; -import { BusinessModule } from './business/business.module'; -import { UserModule } from './user/user.module'; -import { CustomersModule } from './customers/customers.module'; -import { CalendarsModule } from './calendars/calendars.module'; -import { AppoinmentsModule } from './appoinments/appoinments.module'; -import { DemoMaterialModule } from 'app/shared/demo.module'; -import { MatCardModule } from '@angular/material/card'; -import { ServiceListComponent } from './service-list-details/service-list/service-list.component'; -import { ServiceListModule } from './service-list-details/service-list.module'; -import { ConsultantsModule } from './consultants/consultants.module'; +import { AppoinmentRoutingModule } from './appoinment-routing.module'; +import { DemoMaterialModule } from 'app/shared/demo.module'; @NgModule({ declarations: [ 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 b74c495..f477855 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 @@ -18,11 +18,11 @@ th.mat-header-cell, td.mat-cell, td.mat-footer-cell { overflow: hidden!important; background-color: #ffff; } -::ng-deep .body-container { - overflow-x: hidden; - overflow-y: hidden!important; - background-color: #ffff; -} +// ::ng-deep .body-container { +// overflow-x: hidden; +// overflow-y: hidden!important; +// background-color: #ffff; +// } ::ng-deep .mat-expansion-panel:not([class*='mat-elevation-z']) { box-shadow: none!important; } @@ -55,9 +55,9 @@ img { .delete:hover { color:#ff0000; } - ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper { - width: 180%; -} +// ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper { +// width: 180%; +// } ::ng-deep .mat-content { display: block!important; diff --git a/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.scss b/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.scss index 445aa0a..f8954ae 100644 --- a/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.scss +++ b/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.scss @@ -64,10 +64,10 @@ line-height: 15px; font-size: 14px; } -::ng-deep .mat-form-field-appearance-outline .mat-form-field-wrapper { - margin: 0.25em 0; - width: 175%!important; -} +// ::ng-deep .mat-form-field-appearance-outline .mat-form-field-wrapper { +// margin: 0.25em 0; +// width: 175%!important; +// } .mate{ width: 15% !important; } 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 054f56c..7f0f260 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 @@ -18,11 +18,11 @@ th.mat-header-cell, td.mat-cell, td.mat-footer-cell { overflow: hidden!important; background-color: #ffff; } -::ng-deep .body-container { - overflow-x: hidden; - overflow-y: hidden; - background-color: #ffff; -} +// ::ng-deep .body-container { +// overflow-x: hidden; +// overflow-y: hidden; +// background-color: #ffff; +// } ::ng-deep .mat-expansion-panel:not([class*='mat-elevation-z']) { box-shadow: none!important; } @@ -55,9 +55,9 @@ img { .delete:hover { color:#ff0000; } - ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper { - width: 180%; -} +// ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper { +// width: 180%; +// } ::ng-deep .mat-content { display: block!important; 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 4f5766e..92e2173 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 @@ -109,7 +109,7 @@ export class BusinessListComponent implements OnInit { openDialog(action,obj) { obj.action = action; const dialogRef = this.dialog.open(DialogBoxComponent, { - width: '39%', + width: '30%', height: '100%', // maxWidth: '38vw', position: { right: '0' }, @@ -130,7 +130,7 @@ export class BusinessListComponent implements OnInit { console.log('add') let addFormData = { address: row_obj.address, - logo:row_obj.logo, + image:row_obj.logo, // busId: 'abc123', city: row_obj.city, busName: row_obj.busName, @@ -143,7 +143,8 @@ export class BusinessListComponent implements OnInit { }; formValue.push(addFormData); }else if(result.event == 'Update'){ - console.log('Update') + console.log('Update',row_obj) + row_obj.image = row_obj.logo formValue.push(row_obj); } else if(result == 'Delete'){ @@ -161,9 +162,11 @@ export class BusinessListComponent implements OnInit { if (res.status == 200) { // this.customersList = res.data; this.getBusinessList() - // if(result.event == 'Add' && row_obj.admin_checked == true){ - // this.router.navigate(['/add-user-list']) - // } + if(result.event == 'Add' && row_obj.admin_checked == true){ + localStorage.setItem('go_admin','0') + localStorage.setItem('busName',row_obj.busName) + this.router.navigate(['/users',]) + } } else{ // this.customersList=[]; diff --git a/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.html b/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.html index 68fb9ae..036af84 100644 --- a/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.html +++ b/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.html @@ -46,9 +46,9 @@ Working Hrs is required Limit exceed --> - + - + Add Admin diff --git a/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.ts b/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.ts index 41294c8..308a062 100644 --- a/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.ts +++ b/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.ts @@ -19,6 +19,7 @@ export class DialogBoxComponent implements OnInit { action:string; local_data:any; url: string | ArrayBuffer; + imageViewStatus: boolean = false; constructor(private router: Router,private formBuilder: FormBuilder, public dialogRef: MatDialogRef, @Optional() @Inject(MAT_DIALOG_DATA) public data: UsersData) { @@ -29,20 +30,27 @@ export class DialogBoxComponent implements OnInit { get f(){ return this.form.controls; } - // showOptions(event:MatCheckboxChange): void { - // console.log(event.checked); - // this.form['value'].admin_checked = event.checked - // console.log(this.form['value'].admin_checked) - // } + showOptions(event:MatCheckboxChange): void { + console.log(event.checked); + this.form['value'].admin_checked = event.checked + console.log(this.form['value'].admin_checked) + } closeDialog(){ this.dialogRef.close({event:'Cancel'}); } onSelectFile(event) { + console.log(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(); reader.readAsDataURL(event.target.files[0]); reader.onload = (event) => { this.url = event.target.result; + console.log(this.url) } } } @@ -52,8 +60,8 @@ export class DialogBoxComponent implements OnInit { ngOnInit() { let userrole = localStorage.getItem('user_role') this.form = new FormGroup({ - // admin_checked: new FormControl('', [Validators.required]), - // workingHrsJson: new FormControl('', [Validators.required]), + admin_checked: new FormControl('', [Validators.required]), + workingHrsJson: new FormControl('', [Validators.required]), logo: new FormControl('', null), busName: new FormControl('', [Validators.required, Validators.maxLength(20)]), address: new FormControl('', [Validators.required, Validators.maxLength(50)]), diff --git a/ng-seed/src/app/appoinment/consultants/consultants-routing.module.ts b/ng-seed/src/app/appoinment/consultants/consultants-routing.module.ts deleted file mode 100644 index c8bd4a5..0000000 --- a/ng-seed/src/app/appoinment/consultants/consultants-routing.module.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { ConsultantsListComponent } from './consultants-list/consultants-list.component'; - -const routes: Routes = [ - { - path: '', - component: ConsultantsListComponent - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class ConsultantsRoutingModule { } diff --git a/ng-seed/src/app/appoinment/consultants/consultants.module.ts b/ng-seed/src/app/appoinment/consultants/consultants.module.ts deleted file mode 100644 index 7ee73ba..0000000 --- a/ng-seed/src/app/appoinment/consultants/consultants.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { ConsultantsRoutingModule } from './consultants-routing.module'; -import { ConsultantsListComponent } from './consultants-list/consultants-list.component'; -import { DemoMaterialModule } from 'app/shared/demo.module'; -import { NgScrollbarModule } from 'ngx-scrollbar'; -import { ConsultantsDetailsComponent } from './consultants-details/consultants-details.component'; - -@NgModule({ - declarations: [ - ConsultantsListComponent, - ConsultantsDetailsComponent, - ], - imports: [ - DemoMaterialModule, - CommonModule, - ConsultantsRoutingModule, - NgScrollbarModule - ], - exports: [ - - ] -}) -export class ConsultantsModule { } 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 176b8a1..b46a7af 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 @@ -16,13 +16,13 @@ th.mat-header-cell, td.mat-cell, td.mat-footer-cell { } ::ng-deep .mat-drawer-content { overflow: hidden!important; - background-color: #ffff; -} -::ng-deep .body-container { - overflow-x: hidden; - overflow-y: hidden; - background-color: #ffff; + // background-color: #ffff; } +// ::ng-deep .body-container { +// overflow-x: hidden; +// overflow-y: hidden; +// background-color: #ffff; +// } ::ng-deep .mat-expansion-panel:not([class*='mat-elevation-z']) { box-shadow: none!important; } @@ -55,9 +55,9 @@ img { .delete:hover { color:#ff0000; } - ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper { - width: 180%; -} +// ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper { +// width: 180%; +// } ::ng-deep .mat-content { display: block!important; diff --git a/ng-seed/src/app/appoinment/service-list-details/service-api-services/api-service.service.ts b/ng-seed/src/app/appoinment/service-list-details/service-api-services/api-service.service.ts deleted file mode 100644 index 7a43b7b..0000000 --- a/ng-seed/src/app/appoinment/service-list-details/service-api-services/api-service.service.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { environment } from 'environments/environment'; -import { Observable } from 'rxjs'; -import { catchError } from 'rxjs/operators'; - -@Injectable({ - providedIn: 'root' -}) -export class ApiServiceService { - - private apiUrl = environment.apiEndpoint; - constructor(private _http: HttpClient) { } - - getServicesListDetails(): Observable { - console.log('IN') - return this._http.get(this.apiUrl + "getServicesDetails ") - // .pipe( - // catchError(this.handleError('role', [])) - // ) - } - - addFormDetails(addParams): Observable { - return this._http.post(this.apiUrl + 'CreateService', addParams) - // .pipe( - // catchError(this.handleError('role', [])) - // ) - } - - - handleError(arg0: string, arg1: undefined[]): (err: any, caught: Observable) => import("rxjs").ObservableInput { - throw new Error('Method not implemented.'); - } -} diff --git a/ng-seed/src/app/appoinment/service-list-details/service-list-routing.module.ts b/ng-seed/src/app/appoinment/service-list-details/service-list-routing.module.ts deleted file mode 100644 index b3de5ac..0000000 --- a/ng-seed/src/app/appoinment/service-list-details/service-list-routing.module.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { ServiceListComponent } from './service-list/service-list.component'; - -const routes: Routes = [ - { - path: '', - component: ServiceListComponent - }, -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class ServiceListRoutingModule { } diff --git a/ng-seed/src/app/appoinment/service-list-details/service-list.module.ts b/ng-seed/src/app/appoinment/service-list-details/service-list.module.ts deleted file mode 100644 index 9970edb..0000000 --- a/ng-seed/src/app/appoinment/service-list-details/service-list.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { ServiceListRoutingModule } from './service-list-routing.module'; -import { ServiceListComponent } from './service-list/service-list.component'; -import { DemoMaterialModule } from 'app/shared/demo.module'; -import { DialogBoxComponent } from './dialog-box/dialog-box.component'; - - -@NgModule({ - declarations: [ - ServiceListComponent, - DialogBoxComponent - ], - imports: [ - DemoMaterialModule, - CommonModule, - ServiceListRoutingModule, - ], - -}) -export class ServiceListModule { } 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 deleted file mode 100644 index 88dfcea..0000000 --- a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.html +++ /dev/null @@ -1,26 +0,0 @@ -
-
-
-
- -
-
-
- Online Doctor Consultation - Allergist and Clinical Immunologist -
-
-
- - {{serviceListDetails.servicesName}} - {{serviceListDetails.info}} - edit - delete - - {{serviceListDetails.specialties}} - - - - -
-
-
diff --git a/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.html b/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.html index 929848b..caea405 100644 --- a/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.html +++ b/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.html @@ -5,7 +5,14 @@
- + + Business + + Username is required + Limit exceed + + - - - - role is required - Limit exceed + + --> + + Role + + -- + + {{roleNmae.name}} + + + role is required + Name Username is required Limit exceed - + Email + Please enter a valid email address @@ -36,12 +49,14 @@ Email is required - + + Phone No Contact No is required Limit exceed + Password Password is required Limit exceed diff --git a/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.ts b/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.ts index ea882c0..056746b 100644 --- a/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.ts +++ b/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.ts @@ -21,6 +21,7 @@ export class UserDialogBoxComponent implements OnInit { local_data:any; url: string | ArrayBuffer; businessList: any; + public role = [{'name':'BADMIN'},{'name':'CONSULT'},{'name':'FRONTDESK'}] constructor(private router: Router,private formBuilder: FormBuilder, public dialogRef: MatDialogRef, @Optional() @Inject(MAT_DIALOG_DATA) public data: UsersData,public _bus:BusinessService) { @@ -36,7 +37,10 @@ export class UserDialogBoxComponent implements OnInit { if (res.status == 200) { let businessFilter = res['data'].filter(val => val.busName) this.businessList = businessFilter; - console.log(this.businessList) + let data = localStorage.getItem('busName') + this.form.controls['businessselect'].setValue(data) + console.log(this.businessList) + console.log(this.form['value'].businessselect) } } // , error => {this.errorMessage = error}); @@ -71,7 +75,7 @@ export class UserDialogBoxComponent implements OnInit { let userrole = localStorage.getItem('user_role') this.form = new FormGroup({ businessselect: new FormControl('',[Validators.required]), - role: new FormControl('BADMIN', [Validators.required, Validators.maxLength(20)]), + role: new FormControl('', [Validators.required, Validators.maxLength(20)]), userName: new FormControl('', [Validators.required, Validators.maxLength(20)]), contactNo: new FormControl('', [Validators.required, Validators.maxLength(20)]), // lastName: new FormControl('', [Validators.required, Validators.maxLength(20)]), diff --git a/ng-seed/src/app/appoinment/user/user-list/user-list.component.html b/ng-seed/src/app/appoinment/user/user-list/user-list.component.html index be75a82..dfe7298 100644 --- a/ng-seed/src/app/appoinment/user/user-list/user-list.component.html +++ b/ng-seed/src/app/appoinment/user/user-list/user-list.component.html @@ -47,12 +47,12 @@ {{element.password}} - + + Mobile no + {{element.contactNo}} + - + Email diff --git a/ng-seed/src/app/appoinment/user/user-list/user-list.component.scss b/ng-seed/src/app/appoinment/user/user-list/user-list.component.scss index f8a6ba4..4905702 100644 --- a/ng-seed/src/app/appoinment/user/user-list/user-list.component.scss +++ b/ng-seed/src/app/appoinment/user/user-list/user-list.component.scss @@ -18,11 +18,11 @@ th.mat-header-cell, td.mat-cell, td.mat-footer-cell { overflow: hidden!important; background-color: #ffff; } -::ng-deep .body-container { - overflow-x: hidden; - overflow-y: hidden; - background-color: #ffff; -} +// ::ng-deep .body-container { +// overflow-x: hidden; +// overflow-y: hidden; +// background-color: #ffff; +// } ::ng-deep .mat-expansion-panel:not([class*='mat-elevation-z']) { box-shadow: none!important; } @@ -55,9 +55,9 @@ img { .delete:hover { color:#ff0000; } - ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper { - width: 180%; -} +// ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper { +// width: 180%; +// } ::ng-deep .mat-content { display: block!important; diff --git a/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts b/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts index 54aa691..2e1f846 100644 --- a/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts +++ b/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts @@ -41,16 +41,21 @@ const ELEMENT_DATA: UsersData[] = [ }) export class UserListComponent implements OnInit { push: any; - displayedColumns: string[] = ['id', 'role', 'Username', 'Password', 'FirstName', 'LastName', 'email', 'action']; + displayedColumns: string[] = ['id', 'role', 'Username', 'Password', 'mobile_no', 'email', 'action']; dataSource: any; addFormData: any; public usersList:any = new MatTableDataSource(); @ViewChild(MatTable,{static:true}) table: MatTable; @ViewChild(MatPaginator) paginator: MatPaginator; - - - constructor(public dialog: MatDialog, public _use:UserService) { } + constructor(public dialog: MatDialog, public _use:UserService) { + let open_go_admin = localStorage.getItem('go_admin') + if(open_go_admin == '0'){ + this.openDialog('Add',{}) + localStorage.setItem('go_admin','1') + } + + } ngOnInit(): void { // this.dataSource = new MatTableDataSource(ELEMENT_DATA) diff --git a/ng-seed/src/app/end-user/business-centers/centers-list.component.html b/ng-seed/src/app/end-user/business-centers/centers-list.component.html new file mode 100644 index 0000000..e75bc56 --- /dev/null +++ b/ng-seed/src/app/end-user/business-centers/centers-list.component.html @@ -0,0 +1,71 @@ +
+
+

consultant List

+
+
+ + Search consultant + + search + +
+
+ +
+
+
+
+
+
+
+
+
+ user list image +
+
+
+
+
+
{{businessDetails.busName}}
+ + mail + {{businessDetails.email}} + + + phone + {{businessDetails.contactNo}} + + + location_on + {{businessDetails.address}} {{businessDetails.state}} {{businessDetails.city}} + +
+
+ + +
+
+
+
+ + \ No newline at end of file diff --git a/ng-seed/src/app/end-user/business-centers/centers-list.component.scss b/ng-seed/src/app/end-user/business-centers/centers-list.component.scss new file mode 100644 index 0000000..9830e8e --- /dev/null +++ b/ng-seed/src/app/end-user/business-centers/centers-list.component.scss @@ -0,0 +1,120 @@ +//colors +$white: #fff; +$black_10: rgba(0, 0, 0, 0.1); +$black_30: rgba(0, 0, 0, 0.3); +// $color_red_orange_approx: #207b68f2; +$color_red_orange_approx: #4caf50; +$black_60: rgba(0, 0, 0, 0.6); + +.scrollHV { + height: calc(100vh - 105px); +} +::ng-deep .mat-form-field-appearance-fill .mat-form-field-flex { + background-color: #fff0 !important; +} +.flexRow{ + display: flex !important; +} +.page-h{ + color: #217e69; + font-family: sans-serif; +} +.consultant-list-card { + background: $white; + box-shadow: 0 2px 6px $black_10; + transition: all 0.3s ease-in-out 0s; + &:hover { + box-shadow: 0 0 21px $black_30; + cursor: pointer; + transform: scale(1.04); + } +} +.consultant-span{ + font-size: 10px; + color: #0087ba; + font-weight: 600; +} +.consultant-year{ + font-size: 12px; + color: #0087ba; + font-weight: 700; +} +.consultant-qualification{ + font-size: 12px; + color: #658F9B; + font-weight: 600; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} +.consultant-amount{ + color: #658F9B; + margin: 0; + font-size: 12px !important; + line-height: normal; +} +.consultant-pay{ + color: #0087BA; + font-size: 15px; +} +.consultant-language{ + color: #658F9B; + padding: 2px 0; + font-size: 12px; + word-break: break-word; + line-height: 16px; + // white-space: nowrap; + text-overflow: ellipsis; +} +.consultant-img { + top: 25px; + left: 25px; + height: 24px; + display: flex; + text-align: center; + align-items: center; + border-radius: 6px; + justify-content: center; +} +// .mb{ +// margin-bottom: 0.20rem; +// } +// .consultant-card-cover { +// padding: 0rem 6rem; +// position: relative; +// background-size: cover; +// margin-left: -8rem; +// } +.consultant-thumb { + position: absolute; + margin-top: 20px; + img { + border: 5px solid $white; + border-radius: 100%; + height: 75px; + width: 75px; + } +} +.btn-red { + background-color: $color_red_orange_approx; + color: $white; + border: 1px solid $color_red_orange_approx; + float: right; +} + + +// .user-list-wrapper>.user-card-w { +// padding: 1rem; +// } +// ::ng-deep .body-container { +// // overflow-x: hidden; +// overflow-y: auto!important; +// background-color: #ffff; +// } +// .consultant-profile{ +// margin-left: -2rem; +// } +mat-icon{ + color: #979797; + font-size: 16px; +} \ No newline at end of file diff --git a/ng-seed/src/app/end-user/business-centers/centers-list.component.spec.ts b/ng-seed/src/app/end-user/business-centers/centers-list.component.spec.ts new file mode 100644 index 0000000..699e5cf --- /dev/null +++ b/ng-seed/src/app/end-user/business-centers/centers-list.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CentersListComponent } from './centers-list.component'; + +describe('CentersListComponent', () => { + let component: CentersListComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ CentersListComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(CentersListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng-seed/src/app/end-user/business-centers/centers-list.component.ts b/ng-seed/src/app/end-user/business-centers/centers-list.component.ts new file mode 100644 index 0000000..1772e06 --- /dev/null +++ b/ng-seed/src/app/end-user/business-centers/centers-list.component.ts @@ -0,0 +1,28 @@ +import { Component, OnInit } from '@angular/core'; +import { BusinessService } from 'app/appoinment/business/business-service/business.service'; + +@Component({ + selector: 'app-centers-list', + templateUrl: './centers-list.component.html', + styleUrls: ['./centers-list.component.scss'] +}) +export class CentersListComponent implements OnInit { + public filterdata = null; + businessList: any; + constructor(public _bus:BusinessService) { } + + ngOnInit(): void { + this.getServicesList() + } + + getServicesList() { + //this._pd.getTabStatusPdDetails(this.tabStatus) + this._bus.getBusinessListDetails().subscribe(res => { + if (res.status == 200) { + this.businessList = res.data; + } + }); + } + + +} diff --git a/ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.html b/ng-seed/src/app/end-user/consultants/consultants-details/consultants-details.component.html similarity index 100% rename from ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.html rename to ng-seed/src/app/end-user/consultants/consultants-details/consultants-details.component.html diff --git a/ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.scss b/ng-seed/src/app/end-user/consultants/consultants-details/consultants-details.component.scss similarity index 90% rename from ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.scss rename to ng-seed/src/app/end-user/consultants/consultants-details/consultants-details.component.scss index 05b16bc..1edfbc2 100644 --- a/ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.scss +++ b/ng-seed/src/app/end-user/consultants/consultants-details/consultants-details.component.scss @@ -36,9 +36,9 @@ h6{ ::ng-deep .mat-tab-group.mat-primary .mat-ink-bar, .mat-tab-nav-bar.mat-primary .mat-ink-bar { background-color: #658F9B!important; } -::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper { - width: 250%; -} +// ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper { +// width: 250%; +// } .success { background: #fff; box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2); diff --git a/ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.spec.ts b/ng-seed/src/app/end-user/consultants/consultants-details/consultants-details.component.spec.ts similarity index 100% rename from ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.spec.ts rename to ng-seed/src/app/end-user/consultants/consultants-details/consultants-details.component.spec.ts diff --git a/ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.ts b/ng-seed/src/app/end-user/consultants/consultants-details/consultants-details.component.ts similarity index 100% rename from ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.ts rename to ng-seed/src/app/end-user/consultants/consultants-details/consultants-details.component.ts diff --git a/ng-seed/src/app/appoinment/consultants/consultants-list/consultants-list.component.html b/ng-seed/src/app/end-user/consultants/consultants-list.component.html similarity index 76% rename from ng-seed/src/app/appoinment/consultants/consultants-list/consultants-list.component.html rename to ng-seed/src/app/end-user/consultants/consultants-list.component.html index 297a47f..6ad9cee 100644 --- a/ng-seed/src/app/appoinment/consultants/consultants-list/consultants-list.component.html +++ b/ng-seed/src/app/end-user/consultants/consultants-list.component.html @@ -1,6 +1,18 @@ +
+
+

consultant List

+
+
+ + Search consultant + + search + +
+
-
+
@@ -39,7 +51,7 @@ -
diff --git a/ng-seed/src/app/appoinment/consultants/consultants-list/consultants-list.component.scss b/ng-seed/src/app/end-user/consultants/consultants-list.component.scss similarity index 91% rename from ng-seed/src/app/appoinment/consultants/consultants-list/consultants-list.component.scss rename to ng-seed/src/app/end-user/consultants/consultants-list.component.scss index 9dd7c2b..0233cf6 100644 --- a/ng-seed/src/app/appoinment/consultants/consultants-list/consultants-list.component.scss +++ b/ng-seed/src/app/end-user/consultants/consultants-list.component.scss @@ -9,6 +9,10 @@ $black_60: rgba(0, 0, 0, 0.6); padding: 0rem 0.5rem 1rem; padding-bottom: 4rem; } +.page-h{ + color: #217e69; + font-family: sans-serif; +} .scrollHV { height: calc(100vh - 105px); } @@ -98,11 +102,11 @@ $black_60: rgba(0, 0, 0, 0.6); // .user-list-wrapper>.user-card-w { // padding: 1rem; // } -::ng-deep .body-container { - // overflow-x: hidden; - overflow-y: auto!important; - background-color: #ffff; -} +// ::ng-deep .body-container { +// // overflow-x: hidden; +// overflow-y: auto!important; +// background-color: #ffff; +// } // .consultant-profile{ // margin-left: -2rem; // } diff --git a/ng-seed/src/app/appoinment/consultants/consultants-list/consultants-list.component.spec.ts b/ng-seed/src/app/end-user/consultants/consultants-list.component.spec.ts similarity index 100% rename from ng-seed/src/app/appoinment/consultants/consultants-list/consultants-list.component.spec.ts rename to ng-seed/src/app/end-user/consultants/consultants-list.component.spec.ts diff --git a/ng-seed/src/app/appoinment/consultants/consultants-list/consultants-list.component.ts b/ng-seed/src/app/end-user/consultants/consultants-list.component.ts similarity index 93% rename from ng-seed/src/app/appoinment/consultants/consultants-list/consultants-list.component.ts rename to ng-seed/src/app/end-user/consultants/consultants-list.component.ts index c51251a..2d29e76 100644 --- a/ng-seed/src/app/appoinment/consultants/consultants-list/consultants-list.component.ts +++ b/ng-seed/src/app/end-user/consultants/consultants-list.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; +import { Router } from '@angular/router'; import { ConsultantsDetailsComponent } from '../consultants-details/consultants-details.component'; @Component({ @@ -10,8 +11,8 @@ import { ConsultantsDetailsComponent } from '../consultants-details/consultants- export class ConsultantsListComponent implements OnInit { animal: string; name: string; - - constructor(public dialog: MatDialog) {} + public filterdata = null; + constructor(private router:Router,public dialog: MatDialog) {} openDialog(): void { const dialogRef = this.dialog.open(ConsultantsDetailsComponent, { @@ -96,4 +97,7 @@ export class ConsultantsListComponent implements OnInit { img:'assets/images/stethoscope.png' } ]; + goToSlotBooking(){ + this.router.navigate(['/slot-booking']) + } } diff --git a/ng-seed/src/app/end-user/end-user-routing.module.ts b/ng-seed/src/app/end-user/end-user-routing.module.ts new file mode 100644 index 0000000..3485eff --- /dev/null +++ b/ng-seed/src/app/end-user/end-user-routing.module.ts @@ -0,0 +1,53 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { CentersListComponent } from './business-centers/centers-list.component'; +import { ConsultantsListComponent } from './consultants/consultants-list.component'; +import { SearchCategoryComponent } from './search-category/search-category.component'; +import { ServiceListComponent } from './service-list-details/service-list.component'; +import { SlotBookingDetailsComponent } from './slot-booking/slot-booking-details.component'; + +const routes: Routes = [ + { + path: 'slot-booking', + component: SlotBookingDetailsComponent + }, + + { + path: 'search-category', + component: SearchCategoryComponent + }, + { + path: 'business-centers', + component: CentersListComponent + }, + { + path: 'consultant-setting', + component: ConsultantsListComponent + }, + { + path: 'services', + component: ServiceListComponent + }, + // { + // path: 'calendar-list', + // component: CalendarListComponent + // }, + // { + // path: 'calendar-list', + // component: CalendarListComponent + // }, + // { + // path: 'services-list', + // component: ServiceListComponent + // }, + // { + // path: 'consultants-list', + // component: ConsultantsListComponent + // } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class EndUserRoutingModule { } diff --git a/ng-seed/src/app/end-user/end-user.module.ts b/ng-seed/src/app/end-user/end-user.module.ts new file mode 100644 index 0000000..d9c661e --- /dev/null +++ b/ng-seed/src/app/end-user/end-user.module.ts @@ -0,0 +1,35 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { EndUserRoutingModule } from './end-user-routing.module'; +import { DemoMaterialModule } from 'app/shared/demo.module'; +import { NgScrollbarModule } from 'ngx-scrollbar'; +import { SharedModule } from 'app/shared/shared.module'; +import { SlotBookingDetailsComponent } from './slot-booking/slot-booking-details.component'; +import { ServiceListComponent } from './service-list-details/service-list.component'; +import { SearchCategoryComponent } from './search-category/search-category.component'; +import { CentersListComponent } from './business-centers/centers-list.component'; +import { ConsultantsListComponent } from './consultants/consultants-list.component'; +import { DialogBoxComponent } from './service-list-details/dialog-box/dialog-box.component'; +import { ConsultantsDetailsComponent } from './consultants/consultants-details/consultants-details.component'; + + +@NgModule({ + declarations: [ + SlotBookingDetailsComponent, + ServiceListComponent, + SearchCategoryComponent, + ConsultantsListComponent, + CentersListComponent, + DialogBoxComponent, + ConsultantsDetailsComponent + ], + imports: [ + CommonModule, + EndUserRoutingModule, + DemoMaterialModule, + NgScrollbarModule, + SharedModule + ] +}) +export class EndUserModule { } diff --git a/ng-seed/src/app/appoinment/service-list-details/service-api-services/api-service.service.spec.ts b/ng-seed/src/app/end-user/end-user.service.spec.ts similarity index 52% rename from ng-seed/src/app/appoinment/service-list-details/service-api-services/api-service.service.spec.ts rename to ng-seed/src/app/end-user/end-user.service.spec.ts index 7fdb5e5..04cb435 100644 --- a/ng-seed/src/app/appoinment/service-list-details/service-api-services/api-service.service.spec.ts +++ b/ng-seed/src/app/end-user/end-user.service.spec.ts @@ -1,13 +1,13 @@ import { TestBed } from '@angular/core/testing'; -import { ApiServiceService } from './api-service.service'; +import { EndUserService } from './end-user.service'; -describe('ApiServiceService', () => { - let service: ApiServiceService; +describe('EndUserService', () => { + let service: EndUserService; beforeEach(() => { TestBed.configureTestingModule({}); - service = TestBed.inject(ApiServiceService); + service = TestBed.inject(EndUserService); }); it('should be created', () => { diff --git a/ng-seed/src/app/end-user/end-user.service.ts b/ng-seed/src/app/end-user/end-user.service.ts new file mode 100644 index 0000000..79fc490 --- /dev/null +++ b/ng-seed/src/app/end-user/end-user.service.ts @@ -0,0 +1,9 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class EndUserService { + + constructor() { } +} diff --git a/ng-seed/src/app/end-user/search-category/search-category.component.html b/ng-seed/src/app/end-user/search-category/search-category.component.html new file mode 100644 index 0000000..c900be4 --- /dev/null +++ b/ng-seed/src/app/end-user/search-category/search-category.component.html @@ -0,0 +1,220 @@ + +
+ +
+ + Centers +
+
+ + Services +
+
+ + Pactioners +
+ +
+ + +
+
+
+ +
+
+

Service List

+
+
+ + Search Service + + search + +
+
+ +
+
+
+ +
+
+ Online Doctor Consultation - Allergist and Clinical Immunologist +
+
+ + {{serviceListDetails.servicesName}} + + + + + + + + + +
+
+
+ +
+
+
+
+
+
+

consultant List

+
+
+ + Search consultant + + search + +
+
+ +
+
+
+
+
+
+
+
+
+ user list image +
+
+
+
+
+
{{businessDetails.busName}}
+ + mail + {{businessDetails.email}} + + + phone + {{businessDetails.contactNo}} + + + location_on + {{businessDetails.address}} {{businessDetails.state}} {{businessDetails.city}} + +
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+

consultant List

+
+
+ + Search consultant + + search + +
+
+ +
+
+
+
+
+
+ Online Doctor Consultation - Medical Oncology +
+
+
+
+ user list image +
+
+
+
+
{{userDetails.name}}
+ {{userDetails.specialist}}
+ {{userDetails.year}}
+ {{userDetails.qualification}}
+ Starts at ₹ {{userDetails.payment}}
+
+
+ + transcribe + {{userDetails.language}} + + + location_on + {{userDetails.city}} + + + access_time + {{userDetails.time}} + +
+ + +
+
+
+
+
+ + +
+
+
+ + + + \ No newline at end of file diff --git a/ng-seed/src/app/end-user/search-category/search-category.component.scss b/ng-seed/src/app/end-user/search-category/search-category.component.scss new file mode 100644 index 0000000..9ee4b58 --- /dev/null +++ b/ng-seed/src/app/end-user/search-category/search-category.component.scss @@ -0,0 +1,364 @@ +$white: #fff; +$black_10: rgba(0, 0, 0, 0.1); +$black_30: rgba(0, 0, 0, 0.3); +// $color_red_orange_approx: #207b68f2; +$color_red_orange_approx: #4caf50; +$black_60: rgba(0, 0, 0, 0.6); +.toggleSize{ + width: 12rem; + height: 4rem; + border-radius: 5px !important; +} +.mat-button-toggle-appearance-standard { + color: #fff !important; + background: #15786abd !important; +} +.mat-button-toggle-checked { + background-color: #74bc67 !important; +} +.mat-button-toggle-checked.mat-button-toggle-appearance-standard { + color: #fff !important; +} +::ng-deep .mat-button-toggle-appearance-standard .mat-button-toggle-label-content { + line-height: 63px !important; +} +.mat-button-toggle-group-appearance-standard { + border: none !important; +} +.mat-card{ + border-radius: 10px !important; +} +.centersDesign{ + .scrollHV { + height: calc(100vh - 380px); + } + .flexRow{ + display: flex !important; + } + .consultant-list-card { + background: #fff; + box-shadow: 0 2px 6px $black_10; + transition: all 0.3s ease-in-out 0s; + height: 100% !important; + &:hover { + box-shadow: 0 0 21px $black_30; + cursor: pointer; + transform: scale(1.04); + } + } + .consultant-span{ + font-size: 10px; + color: #0087ba; + font-weight: 600; + } + .consultant-year{ + font-size: 12px; + color: #0087ba; + font-weight: 700; + } + .consultant-qualification{ + font-size: 12px; + color: #658F9B; + font-weight: 600; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + .consultant-amount{ + color: #658F9B; + margin: 0; + font-size: 12px !important; + line-height: normal; + } + .consultant-pay{ + color: #0087BA; + font-size: 15px; + } + .consultant-language{ + color: #658F9B; + padding: 2px 0; + font-size: 12px; + word-break: break-word; + line-height: 16px; + // white-space: nowrap; + text-overflow: ellipsis; + } + .consultant-img { + top: 25px; + left: 25px; + height: 24px; + display: flex; + text-align: center; + align-items: center; + border-radius: 6px; + justify-content: center; + } + // .mb{ + // margin-bottom: 0.20rem; + // } + // .consultant-card-cover { + // padding: 0rem 6rem; + // position: relative; + // background-size: cover; + // margin-left: -8rem; + // } + .consultant-thumb { + position: absolute; + margin-top: 20px; + img { + border: 5px solid #fff; + border-radius: 100%; + height: 75px; + width: 75px; + } + } + + + + // .user-list-wrapper>.user-card-w { + // padding: 1rem; + // } + // ::ng-deep .body-container { + // // overflow-x: hidden; + // overflow-y: auto!important; + // background-color: #ffff; + // } + // .consultant-profile{ + // margin-left: -2rem; + // } + mat-icon{ + color: #979797; + font-size: 16px; + } + ::ng-deep .mat-form-field-appearance-fill .mat-form-field-flex { + background-color: #fff0 !important; + } +} +.serviceDesign{ + .scrollHV { + height: calc(100vh - 300px); + } + .Specialties-list-card { + background: #fff; + box-shadow: 0 2px 6px $black_10; + transition: all 0.3s ease-in-out 0s; + &:hover { + box-shadow: 0 0 21px $black_30; + cursor: pointer; + transform: scale(1.04); + } + } + .mat-card{ + margin: 0px !important; + } + .consultant-card-cover { + // padding: 0rem 6rem; + position: relative; + background-size: cover; + margin-left: 0.5rem; + margin-right: 1rem; + } + .page-h{ + color: #217e69; + font-family: sans-serif; + } + .consultant-thumb { + // position: absolute; + // margin-top: 20px; + // margin-left: -45rem; + img { + border: 5px solid #fff;; + border-radius: 100%; + height: 50px; + width: 50px; + // margin-right: -8rem; + } + } + .service-info{ + line-height: 1.5rem!important; + } + .info{ + font-size: 12px!important; + font-weight: 500; + color: rgba(2,71,91,.6); + padding: 0 0 10px; + max-height: 38px; + display: -webkit-box; + overflow: hidden; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + } + .service-Specialties{ + font-size: 10px; + font-weight: 600; + color: #02475b; + padding: 10px 0 0; + // border-top: 1px solid rgba(2,71,91,.3); + } + + .Specialties-rightArrow{ + top: 1rem; + right: 0; + position: absolute; + padding-right: 0.5rem; + } + .flx{ + width: 47%; + } + .Specialties-spContent{ + width: 100%; + // padding: 0 10px 0 0; + position: relative; + // min-height: 60px; + height: 65px; + } + // .mb{ + // margin-bottom: 0.60rem; + // } + ::ng-deep body .mat-card .mat-card-title { + padding-left: 0rem!important; + } + ::ng-deep body .mat-card .mat-card-subtitle { + padding-left: 0rem!important; + } + .buttons{ + float: right; + background-color: #4caf50; + color: #ffff; + } + .edit-color{ + color: white; + } + .edit-color:hover { + color: #4caf50; + } + .delete:hover { + color:#ff0000; + } + .icon-lft{ + margin-left: 6rem; + } + .Specialties-rightUpdate{ + top: 1rem; + right: 0; + position: absolute; + padding-right: 2.5rem; + } + ::ng-deep .mat-form-field-appearance-fill .mat-form-field-flex { + background-color: #fff0 !important; + } +} +.consultantDesign{ + .consultant-content { + padding: 0rem 0.5rem 1rem; + padding-bottom: 4rem; + } + .page-h{ + color: #217e69; + font-family: sans-serif; + } + .scrollHV { + height: calc(100vh - 390px); + } + .consultant-list-card { + background: $white; + box-shadow: 0 2px 6px $black_10; + transition: all 0.3s ease-in-out 0s; + &:hover { + box-shadow: 0 0 21px $black_30; + cursor: pointer; + transform: scale(1.04); + } + } + .consultant-span{ + font-size: 10px; + color: #0087ba; + font-weight: 600; + } + .consultant-year{ + font-size: 12px; + color: #0087ba; + font-weight: 700; + } + .consultant-qualification{ + font-size: 12px; + color: #658F9B; + font-weight: 600; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + .consultant-amount{ + color: #658F9B; + margin: 0; + font-size: 12px !important; + line-height: normal; + } + .consultant-pay{ + color: #0087BA; + font-size: 15px; + } + .consultant-language{ + color: #658F9B; + padding: 2px 0; + font-size: 12px; + word-break: break-word; + line-height: 16px; + white-space: nowrap; + text-overflow: ellipsis; + } + .consultant-img { + top: 25px; + left: 25px; + height: 24px; + display: flex; + text-align: center; + align-items: center; + border-radius: 6px; + justify-content: center; + } + // .mb{ + // margin-bottom: 0.20rem; + // } + .consultant-card-cover { + padding: 0rem 6rem; + position: relative; + background-size: cover; + margin-left: -8rem; + } + .consultant-thumb { + position: absolute; + margin-top: 20px; + img { + border: 5px solid $white; + border-radius: 100%; + height: 75px; + width: 75px; + } + } + .btn-red { + background-color: $color_red_orange_approx; + color: $white; + border: 1px solid $color_red_orange_approx; + float: right; + } + + // .user-list-wrapper>.user-card-w { + // padding: 1rem; + // } + // ::ng-deep .body-container { + // // overflow-x: hidden; + // overflow-y: auto!important; + // background-color: #ffff; + // } + // .consultant-profile{ + // margin-left: -2rem; + // } + mat-icon{ + color: #979797; + font-size: 20px; + } + ::ng-deep .mat-form-field-appearance-fill .mat-form-field-flex { + background-color: #fff0 !important; + } +} \ No newline at end of file diff --git a/ng-seed/src/app/end-user/search-category/search-category.component.spec.ts b/ng-seed/src/app/end-user/search-category/search-category.component.spec.ts new file mode 100644 index 0000000..367ceaf --- /dev/null +++ b/ng-seed/src/app/end-user/search-category/search-category.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SearchCategoryComponent } from './search-category.component'; + +describe('SearchCategoryComponent', () => { + let component: SearchCategoryComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ SearchCategoryComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(SearchCategoryComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng-seed/src/app/end-user/search-category/search-category.component.ts b/ng-seed/src/app/end-user/search-category/search-category.component.ts new file mode 100644 index 0000000..3b7c537 --- /dev/null +++ b/ng-seed/src/app/end-user/search-category/search-category.component.ts @@ -0,0 +1,150 @@ +import { Component, OnInit } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { BusinessService } from 'app/appoinment/business/business-service/business.service'; +import { ApiServiceService } from 'app/appoinment/service-list-details/service-api-services/api-service.service'; +import { UserService } from 'app/appoinment/user/user-service/user.service'; +import { SessionService } from 'app/session-services/session.service'; +import { OtpComponent } from 'app/session/otp/otp.component'; + +@Component({ + selector: 'app-search-category', + templateUrl: './search-category.component.html', + styleUrls: ['./search-category.component.scss'] +}) +export class SearchCategoryComponent implements OnInit { + selectedValue:any + eventData: any; + servicesList: any; + public filterdata = null; + businessList: any; + usersList: any; + public consultants = [{ + name: 'Dr. Suganya', + specialist: 'ENT', + year: '1 YRS EXP', + qualification: 'MBBS, MS', + payment: '800', + language: 'TAMIL, ENGILSH', + city: 'Apollo Hospital Chennai', + image:'assets/images/face1.jpg', + time: 'Available in 3 mins', + img:'assets/images/stethoscope.png' + + },{ + name: 'Dr. Indhu Mathi', + specialist: 'ORTHOPAEDICS', + year: '2 YRS EXP', + qualification: 'MBBS, MS', + payment: '800', + language: 'TAMIL, ENGILSH', + city: 'Apollo Hospital Chennai', + image:'assets/images/face2.jpg', + time: 'Available in 4 mins', + img:'assets/images/stethoscope.png' + },{ + name: 'Dr. Gaurav Kumar', + specialist: 'BREAST SURGERY', + year: '3 YRS EXP', + qualification: 'MBBS, MS', + payment: '800', + language: 'TAMIL, ENGILSH', + city: 'Apollo Hospital Chennai', + image:'assets/images/face3.jpg', + time: 'Available in 5 mins', + img:'assets/images/stethoscope.png' + },{ + name: 'Dr. Saloni Sinha', + specialist: 'CARDIOLOGY', + year: '4 YRS EXP', + qualification: 'MBBS, MS', + payment: '800', + language: 'TAMIL, ENGILSH', + city: 'Apollo Hospital Chennai', + image:'assets/images/face4.jpg', + time: 'Available in 6 mins', + img:'assets/images/stethoscope.png' + },{ + name: 'Dr. Padmaja', + specialist: 'DIABETOLOGY', + year: '5 YRS EXP', + qualification: 'MBBS, MS', + payment: '800', + language: 'TAMIL, ENGILSH', + city: 'Apollo Hospital Chennai', + image:'assets/images/face5.jpg', + time: 'Available in 7 mins', + img:'assets/images/stethoscope.png' + },{ + name: 'Dr. Pradeep ', + specialist: 'ENDOCRINOLOGY', + year: '6 YRS EXP', + qualification: 'MBBS, MS', + payment: '800', + language: 'TAMIL, ENGILSH', + city: 'Apollo Hospital Chennai', + image:'assets/images/face6.jpg', + time: 'Available in 8 mins', + img:'assets/images/stethoscope.png' + } +] + constructor(private router:Router,public dialog: MatDialog,public _api:ApiServiceService,public _bus:BusinessService,public _use:UserService) { } + + ngOnInit(): void { + } + + openOTP(): void { + const dialogRef = this.dialog.open(OtpComponent, { + width: '35%', + // data: {name: this.name, animal: this.animal} + }); + dialogRef.afterClosed().subscribe(result => { + console.log('The dialog was closed'); + // this.animal = result; + }); + } + + onValChange(event){ + console.log(event) + this.eventData = event; + console.log(this.eventData) + if(this.eventData == 'services'){ + //this._pd.getTabStatusPdDetails(this.tabStatus) + this._api.getServicesListDetails().subscribe(res => { + if (res.status == 200) { + this.servicesList = res.data; + } + }); + }else if(this.eventData == 'centers'){ + //this._pd.getTabStatusPdDetails(this.tabStatus) + this._bus.getBusinessListDetails().subscribe(res => { + if (res.status == 200) { + this.businessList = res.data; + } + }); + } else if(this.eventData == 'consultants'){ + this._use.getUsersListDetails().subscribe(res => { + if (res.status == 200) { + console.log(res) + // let data = res['data'].filter(val => val.role == 'CONSULT') + this.usersList = this.consultants; + console.log(this.usersList) + } + }); + + } + } + + goToService(id,event){ + console.log(id) + if(event == '1'){ + this.router.navigate(['/services']) + }else if(event == '2'){ + this.router.navigate(['/business-centers']) + }else if(event == '3'){ + this.router.navigate(['/services']) + } + + } + +} diff --git a/ng-seed/src/app/appoinment/service-list-details/dialog-box/dialog-box.component.html b/ng-seed/src/app/end-user/service-list-details/dialog-box/dialog-box.component.html similarity index 100% rename from ng-seed/src/app/appoinment/service-list-details/dialog-box/dialog-box.component.html rename to ng-seed/src/app/end-user/service-list-details/dialog-box/dialog-box.component.html diff --git a/ng-seed/src/app/appoinment/service-list-details/dialog-box/dialog-box.component.scss b/ng-seed/src/app/end-user/service-list-details/dialog-box/dialog-box.component.scss similarity index 100% rename from ng-seed/src/app/appoinment/service-list-details/dialog-box/dialog-box.component.scss rename to ng-seed/src/app/end-user/service-list-details/dialog-box/dialog-box.component.scss diff --git a/ng-seed/src/app/appoinment/service-list-details/dialog-box/dialog-box.component.spec.ts b/ng-seed/src/app/end-user/service-list-details/dialog-box/dialog-box.component.spec.ts similarity index 100% rename from ng-seed/src/app/appoinment/service-list-details/dialog-box/dialog-box.component.spec.ts rename to ng-seed/src/app/end-user/service-list-details/dialog-box/dialog-box.component.spec.ts diff --git a/ng-seed/src/app/appoinment/service-list-details/dialog-box/dialog-box.component.ts b/ng-seed/src/app/end-user/service-list-details/dialog-box/dialog-box.component.ts similarity index 100% rename from ng-seed/src/app/appoinment/service-list-details/dialog-box/dialog-box.component.ts rename to ng-seed/src/app/end-user/service-list-details/dialog-box/dialog-box.component.ts diff --git a/ng-seed/src/app/end-user/service-list-details/service-list.component.html b/ng-seed/src/app/end-user/service-list-details/service-list.component.html new file mode 100644 index 0000000..81290c3 --- /dev/null +++ b/ng-seed/src/app/end-user/service-list-details/service-list.component.html @@ -0,0 +1,36 @@ +
+
+

Service List

+
+
+ + Search Service + + search + +
+
+ +
+
+
+ +
+
+ Online Doctor Consultation - Allergist and Clinical Immunologist +
+
+ + {{serviceListDetails.servicesName}} + + + + + + + + + +
+
+
diff --git a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.scss b/ng-seed/src/app/end-user/service-list-details/service-list.component.scss similarity index 87% rename from ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.scss rename to ng-seed/src/app/end-user/service-list-details/service-list.component.scss index 7b2ec62..09a98ff 100644 --- a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.scss +++ b/ng-seed/src/app/end-user/service-list-details/service-list.component.scss @@ -14,6 +14,9 @@ $main-color: #f44336; transform: scale(1.04); } } +.mat-card{ + margin: 0px !important; +} .consultant-card-cover { // padding: 0rem 6rem; position: relative; @@ -21,6 +24,10 @@ $main-color: #f44336; margin-left: 0.5rem; margin-right: 1rem; } +.page-h{ + color: #217e69; + font-family: sans-serif; +} .consultant-thumb { // position: absolute; // margin-top: 20px; @@ -66,14 +73,14 @@ $main-color: #f44336; } .Specialties-spContent{ width: 100%; - padding: 0 10px 0 0; + // padding: 0 10px 0 0; position: relative; // min-height: 60px; height: 65px; } -.mb{ - margin-bottom: 0.60rem; -} +// .mb{ +// margin-bottom: 0.60rem; +// } ::ng-deep body .mat-card .mat-card-title { padding-left: 0rem!important; } @@ -103,3 +110,6 @@ $main-color: #f44336; position: absolute; padding-right: 2.5rem; } +::ng-deep .mat-form-field-appearance-fill .mat-form-field-flex { + background-color: #fff0 !important; +} diff --git a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.spec.ts b/ng-seed/src/app/end-user/service-list-details/service-list.component.spec.ts similarity index 100% rename from ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.spec.ts rename to ng-seed/src/app/end-user/service-list-details/service-list.component.spec.ts diff --git a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts b/ng-seed/src/app/end-user/service-list-details/service-list.component.ts similarity index 99% rename from ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts rename to ng-seed/src/app/end-user/service-list-details/service-list.component.ts index d392580..c7d4b70 100644 --- a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts +++ b/ng-seed/src/app/end-user/service-list-details/service-list.component.ts @@ -21,7 +21,9 @@ export class ServiceListComponent implements OnInit { push: any; id: number; serviceId: number; + public filterdata = null; public servicesList:any = new MatTableDataSource(); + constructor(public _api:ApiServiceService, public dialog: MatDialog) { } ngOnInit(): void { diff --git a/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.html b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.html new file mode 100644 index 0000000..fc4de51 --- /dev/null +++ b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.html @@ -0,0 +1,92 @@ + +
+
+

Slot Availability

+
+
+
Date & Time: {{selected | date:'mediumDate'}}
+
+
+
+
+
+
+ + + +
+
+
+
+
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+
+ + +
+ \ No newline at end of file diff --git a/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.scss b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.scss new file mode 100644 index 0000000..272a80c --- /dev/null +++ b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.scss @@ -0,0 +1,49 @@ +$color_red_orange_approx: #4caf50; +$white: #fff; +.button{ + margin-bottom: 1rem; + background-color: #ffff !important; + margin-top: -3rem; + float: right; +} +.calender{ + margin-left: -1rem; + padding-right: 6rem; +} +.cardCalender{ + width: 140%; +} +::ng-deep .mat-tab-label { +margin-left: -3rem!important; +} +.img{ + width: 50px; +} +.btn-red { + background-color: $color_red_orange_approx; + color: $white; + border: 1px solid $color_red_orange_approx; + float: right; +} +h6{ + color: #0087ba; + font-weight: 600; +} +.primary{ + background-color: #658F9B; + color: white; +} +::ng-deep .mat-tab-group.mat-primary .mat-ink-bar, .mat-tab-nav-bar.mat-primary .mat-ink-bar { + background-color: #658F9B!important; +} +// ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper { +// width: 250%; +// } +.success { + background: #fff; + box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2); + padding: 5px; + color: #0087ba; + font-weight: 600; + border-radius: 10px; + } \ No newline at end of file diff --git a/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.spec.ts b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.spec.ts new file mode 100644 index 0000000..5a99ea2 --- /dev/null +++ b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SlotBookingDetailsComponent } from './slot-booking-details.component'; + +describe('SlotBookingDetailsComponent', () => { + let component: SlotBookingDetailsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ SlotBookingDetailsComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(SlotBookingDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.ts b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.ts new file mode 100644 index 0000000..c6f5de7 --- /dev/null +++ b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.ts @@ -0,0 +1,44 @@ +import { Component, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; + +@Component({ + selector: 'app-slot-booking-details', + templateUrl: './slot-booking-details.component.html', + styleUrls: ['./slot-booking-details.component.scss'] +}) +export class SlotBookingDetailsComponent implements OnInit { + form: FormGroup; + local_data:any; + selected: Date | null; + name = 'Angular'; + date = new Date(); + control = new FormControl( + { + from: this.date, + // to: new Date(this.date.getTime() + 1 * 24 * 60 * 60 * 1000), + }, + Validators.required + ); + workspace = new FormControl('', [Validators.required]); + selects = [ + {workspace: 'test 1'}, + {workspace: 'test 2'}, + {workspace: 'test 3'}, + ]; + constructor() { } + + + ngOnInit(): void { + this.form = new FormGroup({ + + workspace: new FormControl('', [Validators.required]), + }); +console.log(this.local_data, this.selects) +// this.form.controls['note'].setValue('Sample') + this.form.patchValue(this.local_data) + } + submit(){ + console.log(this.form.value); + } + +} diff --git a/ng-seed/src/app/layouts/role-menu-items.pipe.ts b/ng-seed/src/app/layouts/role-menu-items.pipe.ts index 75ef17c..762a6de 100644 --- a/ng-seed/src/app/layouts/role-menu-items.pipe.ts +++ b/ng-seed/src/app/layouts/role-menu-items.pipe.ts @@ -10,8 +10,9 @@ export class RoleMenuItemsPipe implements PipeTransform { // // this is for horizontal menu filter // if(type=="1"){ switch(localStorage.getItem('user_role')){ - case 'SADMIN': return value.filter(val=>val.state!="appoinments" && val.state!="customers" && val.state!="consultants" && val.state != "services" && val.state != "consultant-setting"); - case 'BADMIN': return value.filter(val=>val.state !="business" && val.state!="appoinments" && val.state!="consultants" && val.state != "users"); + case 'SADMIN': return value.filter(val=>val.state!="appoinments" && val.state!="customers" && val.state != "consultant-setting"); + case 'BADMIN': return value.filter(val=>val.state !="business" && val.state!="appoinments" && val.state!="customers" && val.state!="consultants" && val.state != "consultant-setting"); + case 'CONSULT': return value.filter(val=>val.state !="business" && val.state!="consultants" && val.state!="users" && val.state!="services"); // case 'CONSULT': // case '3': return value.filter(val=>val.state!="settings"); // case '4': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="reports" && val.state!="sales-pd-list"); diff --git a/ng-seed/src/app/session/otp/otp.component.html b/ng-seed/src/app/session/otp/otp.component.html index 1536602..4885cfb 100644 --- a/ng-seed/src/app/session/otp/otp.component.html +++ b/ng-seed/src/app/session/otp/otp.component.html @@ -1,5 +1,5 @@ -

+ - -

- + --> +
+
+ +
+
+

Hi

+
+
+ +
+
+
+
+

Please enter your mobile number to login

+
+
+
+
+ + + + OTP will be sent to this number by SMS and whatsapp. +
+
+ + + +
+
+ +
+
+ + + + + + + + + +
+ + +
+
\ No newline at end of file diff --git a/ng-seed/src/app/session/otp/otp.component.scss b/ng-seed/src/app/session/otp/otp.component.scss index 29ebb6e..6896d70 100644 --- a/ng-seed/src/app/session/otp/otp.component.scss +++ b/ng-seed/src/app/session/otp/otp.component.scss @@ -14,6 +14,6 @@ mat-form-field { .mat-form-field-appearance-legacy .mat-hint{ color:rgba(0, 0, 0, 0.8) !important; } -::ng-deep .cdk-overlay-pane { - width: 45%!important; -} +// ::ng-deep .cdk-overlay-pane { +// width: 45%!important; +// } diff --git a/ng-seed/src/app/session/otp/otp.component.ts b/ng-seed/src/app/session/otp/otp.component.ts index 44e17e1..e596903 100644 --- a/ng-seed/src/app/session/otp/otp.component.ts +++ b/ng-seed/src/app/session/otp/otp.component.ts @@ -24,6 +24,7 @@ export class OtpComponent implements OnInit { right: '' } }; + fieldData: any = 1; constructor(private dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data: any, private dialog: MatDialog) { // this.loggedEmailID = this.data; this.timeLeft = 60; @@ -38,6 +39,10 @@ export class OtpComponent implements OnInit { ngOnInit(): void { } + getOTP(param){ + console.log(param) + this.fieldData = param; + } resendOTP() { this.timeLeft = 60; diff --git a/ng-seed/src/app/shared/menu-items/horizontal-menu-items.ts b/ng-seed/src/app/shared/menu-items/horizontal-menu-items.ts index 4f13e3e..566ea11 100644 --- a/ng-seed/src/app/shared/menu-items/horizontal-menu-items.ts +++ b/ng-seed/src/app/shared/menu-items/horizontal-menu-items.ts @@ -99,6 +99,24 @@ const HORIZONTALMENUITEMS = [ name: 'My Settings', type: 'link', icon: 'settings_system_daydream' + }, + { + state: 'business-centers', + name: 'Centers', + type: 'link', + icon: 'settings_system_daydream' + }, + { + state: 'search-category', + name: 'search Category', + type: 'link', + icon: 'settings_system_daydream' + }, + { + state: 'slot-booking', + name: 'Slot Booking', + type: 'link', + icon: 'settings_system_daydream' } ]; diff --git a/ng-seed/src/app/shared/menu-items/menu-items.ts b/ng-seed/src/app/shared/menu-items/menu-items.ts index 5f173aa..c7c8989 100644 --- a/ng-seed/src/app/shared/menu-items/menu-items.ts +++ b/ng-seed/src/app/shared/menu-items/menu-items.ts @@ -98,6 +98,24 @@ const MENUITEMS : Menu[] = [ name: 'My Settings', type: 'link', icon: 'settings_system_daydream' + }, + { + state: 'business-centers', + name: 'Centers', + type: 'link', + icon: 'settings_system_daydream' + }, + { + state: 'search-category', + name: 'search Category', + type: 'link', + icon: 'settings_system_daydream' + }, + { + state: 'slot-booking', + name: 'Slot Booking', + type: 'link', + icon: 'settings_system_daydream' } ]; diff --git a/ng-seed/src/app/shared/pipe/search-filter.pipe.spec.ts b/ng-seed/src/app/shared/pipe/search-filter.pipe.spec.ts new file mode 100644 index 0000000..d4dcbe5 --- /dev/null +++ b/ng-seed/src/app/shared/pipe/search-filter.pipe.spec.ts @@ -0,0 +1,8 @@ +import { SearchFilterPipe } from './search-filter.pipe'; + +describe('SearchFilterPipe', () => { + it('create an instance', () => { + const pipe = new SearchFilterPipe(); + expect(pipe).toBeTruthy(); + }); +}); diff --git a/ng-seed/src/app/shared/pipe/search-filter.pipe.ts b/ng-seed/src/app/shared/pipe/search-filter.pipe.ts new file mode 100644 index 0000000..a236e36 --- /dev/null +++ b/ng-seed/src/app/shared/pipe/search-filter.pipe.ts @@ -0,0 +1,27 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'searchFilter' +}) +export class SearchFilterPipe implements PipeTransform { + + transform(items: any[], filterdata: string, name:string): any[] { + console.log(items,name) + if(!items) return []; + if(!filterdata) return items; + console.log(filterdata); + filterdata = filterdata.toString().toLowerCase(); + return items.filter( it => { + console.log(it); + if(name == 'service'){ + return it.servicesName.toLowerCase().includes(filterdata); + }else if(name == 'centers'){ + return it.busName.toLowerCase().includes(filterdata); + }else if(name == 'consultants'){ + return it.userName.toLowerCase().includes(filterdata); + } + + }); + } + +} diff --git a/ng-seed/src/app/shared/shared.module.ts b/ng-seed/src/app/shared/shared.module.ts index 9dbf911..e39c5d0 100644 --- a/ng-seed/src/app/shared/shared.module.ts +++ b/ng-seed/src/app/shared/shared.module.ts @@ -4,19 +4,22 @@ import { MenuItems } from './menu-items/menu-items'; import { HorizontalMenuItems } from './menu-items/horizontal-menu-items'; import { AccordionAnchorDirective, AccordionLinkDirective, AccordionDirective } from './accordion'; import { ToggleFullscreenDirective } from './fullscreen/toggle-fullscreen.directive'; +import { SearchFilterPipe } from './pipe/search-filter.pipe'; @NgModule({ declarations: [ AccordionAnchorDirective, AccordionLinkDirective, AccordionDirective, - ToggleFullscreenDirective + ToggleFullscreenDirective, + SearchFilterPipe ], exports: [ AccordionAnchorDirective, AccordionLinkDirective, AccordionDirective, - ToggleFullscreenDirective + ToggleFullscreenDirective, + SearchFilterPipe ], providers: [ MenuItems, HorizontalMenuItems ] }) diff --git a/ng-seed/src/assets/styles/scss/_app.variables.scss b/ng-seed/src/assets/styles/scss/_app.variables.scss index cab788b..58d1ca1 100644 --- a/ng-seed/src/assets/styles/scss/_app.variables.scss +++ b/ng-seed/src/assets/styles/scss/_app.variables.scss @@ -31,7 +31,7 @@ $main-header-bg-color:#fff; $main-header-text-color:rgba(mat-color($foreground, base), 0.87); $card-spacing:1.5rem; $user-profile-name-color:#fff; -$user-profile-thumb-border:4px solid rgba(255, 255, 255, 0.3); +$user-profile-thumb-border:4px solid #1f7f6f; $profile-link:#fff; $main-bg-color:linear-gradient(58deg, #f44336, #673ab7); //