{{check(days) | date:'longDate'}}
-
-
-
+
+
+
+
+
@@ -125,22 +137,24 @@
-
+ Sure to delete {{local_data.cusName}}?
+
{
if (res.status == 200) {
console.log(res)
@@ -527,8 +530,10 @@ export class DialogBoxComponent implements OnInit {
// });
}
})
+ this.form.controls['appoinmentDate'].setValue(this.days[ this.clicks])
}
goToSlotBooking2(){
+
// this.days[]
if(this.clicks >0){
this.clicks -= 1;
@@ -549,7 +554,7 @@ export class DialogBoxComponent implements OnInit {
userId = this.frontDeskChoosedPractiID
}
let params ={"id":userId , "day": this.dayName , "addcount": this.clicks}
-
+console.log(params)
this.end_user.getSlots(params).subscribe(res => {
if (res.status == 200) {
console.log(res)
@@ -558,6 +563,7 @@ export class DialogBoxComponent implements OnInit {
}
})
console.log( this.clicks)
+ this.form.controls['appoinmentDate'].setValue(this.days[ this.clicks])
}
check(param){
return param[this.clicks];
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 4791ddb..c5845d4 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
@@ -48,8 +48,9 @@
}
}
::ng-deep .mat-dialog-content {
- max-height: 170vh !important;
- overflow: hidden!important;
+ max-height: unset !important;
+ overflow: unset!important;
+ // overflow: hidden!important;
}
::ng-deep .mat-dialog-container{
overflow: hidden!important;
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 8d241b2..a490086 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
@@ -1,11 +1,24 @@
- Filter
-
-
-Click here to see Inactive List
-
+
@@ -71,14 +84,13 @@
+
-
+
+
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 9054d71..e1a8aa4 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
@@ -8,6 +8,7 @@
float: right;
background-color: #4caf50;
color: #ffff;
+ height: 35px;
}
th.mat-header-cell, td.mat-cell, td.mat-footer-cell {
padding: 6px;
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 522b97d..e84fdce 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
@@ -94,6 +94,7 @@ export class BusinessListComponent implements OnInit {
getBusinessList() {
//this._pd.getTabStatusPdDetails(this.tabStatus)
this._bus.getBusinessListDetails().subscribe(res => {
+
if (res.status == 200) {
this.isLoading = false
this.businessList = res.data;
@@ -303,10 +304,16 @@ export class BusinessListComponent implements OnInit {
return this.apiUrl+'imageViewer?img_name='+image;
}
- setAll(check) {
- console.log(check)
- this.activeAndInactive = check
- this.getBusinessList()
+// setAll(check) {
+// console.log(check)
+// this.activeAndInactive = check
+// this.getBusinessList()
+// }
+
+ onToggleChange(event){
+ console.log(event)
+ this.activeAndInactive = event
+ this.getBusinessList()
}
}
diff --git a/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.html b/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.html
index 739a9c3..c766a18 100644
--- a/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.html
+++ b/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.html
@@ -15,28 +15,33 @@
-->
-
+
+
+
{{ viewDate | calendarDate:(view + 'ViewTitle'):'en' }}
- {{ viewDate | calendarDate:(view + 'ViewTitle'):'en' }}
+
-
\ No newline at end of file
diff --git a/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.scss b/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.scss
index 56d45ab..4a4a031 100644
--- a/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.scss
+++ b/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.scss
@@ -16,4 +16,15 @@ mat-card {
.btn{
background-color: #4caf50!important;
color: white;
-}
\ No newline at end of file
+}
+.scrollHV{
+ height: calc(100vh - 190px);
+}
+
+::ng-deep .mat-button-toggle-appearance-standard .mat-button-toggle-label-content {
+ line-height: 0px !important;
+ }
+
+ ::ng-deep .mat-button-toggle-button {
+ padding: 5px 7px !important;
+ }
\ No newline at end of file
diff --git a/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.ts b/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.ts
index ee2646c..4a48af0 100644
--- a/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.ts
+++ b/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.ts
@@ -7,6 +7,14 @@ import { Subject } from 'rxjs';
import { CalendarEvent, CalendarEventAction, CalendarEventTimesChangedEvent } from 'angular-calendar';
import { CalendardialogComponent } from '../calendardialog/calendardialog.component';
import { DialogBoxComponent } from 'app/appoinment/appoinments/dialog-box/dialog-box.component';
+import { DatePipe } from '@angular/common';
+import { MatTable, MatTableDataSource } from '@angular/material/table';
+import { environment } from 'environments/environment';
+import { PageEvent } from '@angular/material/paginator';
+import { Router } from '@angular/router';
+import { NotifierService } from 'angular-notifier';
+import { AppointmentsService } from 'app/appoinment/appoinments/appointments-service/appointments.service';
+import Swal from 'sweetalert2';
const colors: any = {
red: {
@@ -28,6 +36,27 @@ const colors: any = {
styleUrls: ['./calendar-list.component.scss']
})
export class CalendarListComponent implements OnInit {
+ push: any;
+ displayedColumns: string[] = ['id','ClientName','datetime','phoneNo','email','status', 'action'];
+ public appointmentListLength: number;
+ // pagination variable details
+ length = 5;
+ pageIndex = 0;
+ pageSize = 10;
+ pageEvent: PageEvent;
+ appoinmentsList: any = [];
+ private apiUrl = environment.apiEndpoint;
+ // dataSource: any;
+ appointmentListSource:any = []
+ // dataSource: any = new MatTableDataSource(ELEMENT_DATA);
+ // @ViewChild(MatPaginator) paginator: MatPaginator;
+ addFormData: any;
+
+ pipe = new DatePipe('en-US');
+ isLoading = true
+ consultants: any = [];
+ selectPractitioner:any = [];
+ user_role: any=[];
dataSource: any;
private yesterday: Date;
dialogRef: MatDialogRef;
@@ -107,84 +136,378 @@ export class CalendarListComponent implements OnInit {
activeDayIsOpen = false;
table: any;
-
- constructor(public dialog: MatDialog) {
+ recordStatus: boolean;
+ bookedDetails: any = [];
+ constructor(public dialog: MatDialog,private router: Router,private notifierService: NotifierService, public _app:AppointmentsService) {
this.initializeYesterday();
this.initializeEvents();
}
+
+
+
+ ngOnInit(): void {
+ this.recordStatus=false;
+ this.user_role = localStorage.getItem('user_role');
+ if(this.user_role != 'FRONTDESK'){
+ let param ={"busId":localStorage.getItem('busId'),"userId":localStorage.getItem('user_id')}
+ console.log(param)
+ this.getAppoinmentsList(param)
+ }else{
+ let param ={"busId": localStorage.getItem('busId')}
+ console.log(param)
+ this.getAppoinmentsList(param)
+ this.getCosultantList()
+ }
+
+
+
+ }
+
+ // ngAfterViewInit() {
+ // this.appointmentListSource.paginator = this.paginator;
+ // console.log(this.appointmentListSource,this.paginator)
+ // this.appointmentListSource.sort = this.sort;
+ // }
+
+ applyFilter(filterValue: string) {
+ filterValue = filterValue.trim(); // Remove whitespace
+ filterValue = filterValue.toLowerCase(); // Datasource defaults to lowercase matches
+ this.appointmentListSource.filter = filterValue;
+ console.log(this.appointmentListSource)
+ }
+
+ getCosultantList() {
+ let param ={"busId": localStorage.getItem('busId')}
+ console.log(param)
+ this._app.getCosultantListDetails(param).subscribe(res => {
+ if (res.status == 200) {
+ console.log(res.data)
+ let consultantsList = res.data;
+ this.consultants = consultantsList.filter(val => val.role == 'PRACTITIONER')
+ console.log(this.consultants)
+ }
+ else{
+ this.consultants=[];
+ }
+ });
+ }
+
+ allPractitioner(){
+ let param ={"busId": localStorage.getItem('busId')}
+ console.log(param)
+ this.getAppoinmentsList(param)
+ }
+
+ getPractitioner(selectedPractititoner){
+ console.log(selectedPractititoner)
+ this.appoinmentsList=[]
+ // {"busId":abc123,userId:"2"} or param = {"busId":abc123}
+ let param = {"busId": selectedPractititoner.busId,"userId":selectedPractititoner.id}
+ this.getAppoinmentsList(param)
+ }
+
+ getAppoinmentsList(param) {
+ this.appoinmentsList=[]
+ let user_role = localStorage.getItem('user_role');
+ console.log(param)
+ this._app.getAppoinmentsListDetails(param).subscribe(res => {
+
+ if (res.status == 200) {
+ this.isLoading = false
+ this.appoinmentsList = res.data;
+ localStorage.setItem('busId', res.data[0].busId
+ )
+ console.log(this.appoinmentsList)
+ this.appointmentListLength = res.data.length;
+ console.log(this.appointmentListLength)
+ this.appointmentListSource['data'] = this.appoinmentsList;
+ console.log(this.appointmentListSource)
+
+ console.log(this.appoinmentsList)
+
+ this.appoinmentsList.forEach(element => {
+ console.log(element)
+ element.appoinmentSlots = JSON.parse(element.appoinmentSlots)
+ });
+ console.log(this.appoinmentsList)
+ this.events = []
+
+ if(user_role == 'PRACTITIONER'){
+ console.log('if ')
+ let id = localStorage.getItem('user_id')
+ console.log(id)
+ this.appointmentListSource['data'] = this.appoinmentsList;
+ this.appointmentListSource
+ console.log(this.appointmentListSource)
+ let filter = this.appointmentListSource['data'].filter(arr=>{return arr["ServicesMapDetail.userId"] == id})
+ console.log(filter)
+ filter.sort((a: any, b: any) => {
+ return b.id - a.id;
+ });
+ filter.forEach((element, index) => {
+ element.index = index
+
+ });
+ this.appointmentListSource['data'] = filter
+
+ filter.forEach(element => {
+ console.log(element.appoinmentSlots[element.appoinmentSlots.length-1])
+ this.addEvent(element.appoinmentSlots[0],element.appoinmentSlots[element.appoinmentSlots.length-1],element.bookingId)
+ });
+ this.appointmentListLength = filter.length;
+ console.log(this.appointmentListSource)
+ this.recordStatus=false;
+
+ } else {
+ console.log('else')
+ this.appointmentListLength = res.data.length;
+ console.log(this.appointmentListLength)
+ this.appoinmentsList.sort((a: any, b: any) => {
+ return b.id - a.id;
+ });
+ this.appoinmentsList.forEach((element, index) => {
+ element.index = index
+
+
+ });
+ this.appointmentListSource['data'] = this.appoinmentsList;
+
+ this.appoinmentsList.forEach(element => {
+ console.log(element.appoinmentSlots[element.appoinmentSlots.length-1])
+ this.addEvent( element.appoinmentSlots[0],element.appoinmentSlots[element.appoinmentSlots.length-1],element.bookingId)
+ });
+
+ // this.appoinmentsList.forEach(element => {
+ // element.appoinmentSlots = JSON.parse(element.appoinmentSlots)
+
+ // this.addEvent( element.appoinmentSlots[0])
+ // });
+
+
+ console.log(this.appointmentListSource)
+
+ }
+ this.recordStatus=false;
+ }
+ else{
+ this.isLoading = false
+ this.appoinmentsList=[];
+ this.appointmentListLength= null;
+ this.recordStatus=true;
+ }
+ }, error => this.isLoading = false)
+
+ }
+
+
+ pageChange(e) {
+ console.log(e);
+ }
+
+
+ confirmBox(event,element){
+ console.log(event,element)
+ Swal.fire({
+ title: 'Are you sure want to Delete?',
+ text: 'You will not be able to recover this Appointment!',
+ icon: 'warning',
+ showCancelButton: true,
+ confirmButtonText: 'Yes, delete it!',
+ cancelButtonText: 'No, keep it'
+ }).then((result) => {
+ if (result.value) {
+ console.log('entry')
+ // this.deleteRowData(element);
+ this.formAddUpdateAndDelete(event,element)
+ Swal.fire(
+ 'Deleted!',
+ 'Your Appointment has been deleted.',
+ 'success'
+ )
+ } else if (result.dismiss === Swal.DismissReason.cancel) {
+ Swal.fire(
+ 'Cancelled',
+ 'Your Appointment is safe :)',
+ 'error'
+ )
+ }
+
+ })
+ }
+ openDialog(action,obj) {
+ obj.action = action;
+ const dialogRef = this.dialog.open(DialogBoxComponent, {
+ width: '40%',
+ height: '100%',
+ // maxWidth: '38vw',
+ position: { right: '0' },
+ data:obj
+ });
+ dialogRef.afterClosed().subscribe(result => {
+ console.log(result)
+ this.bookedDetails = result.response['data'][0]
+ if(result.data == 0){
+ if(this.user_role != 'FRONTDESK'){
+ let param ={"busId":localStorage.getItem('busId'),"userId":localStorage.getItem('user_id')}
+ console.log(param)
+ this.getAppoinmentsList(param)
+ }else{
+ let param ={"busId": localStorage.getItem('busId')}
+ console.log(param)
+ this.getAppoinmentsList(param)
+ }
+ }
+ });
+ }
+ formAddUpdateAndDelete(result,row_obj){
+ console.log(result,row_obj)
+ let formValue = []
+ if(result.event == 'Add'){
+ console.log('add')
+ let addFormData = {
+ busId: row_obj.busId,
+ appoinmentTime: row_obj.appoinmentTime,
+ booking: row_obj.booking,
+ workspace: row_obj.workspace,
+ service: row_obj.service,
+ staff: row_obj.staff,
+ customer: row_obj.customer,
+ paymentStatus: row_obj.paymentStatus,
+ status: row_obj.status,
+ appoinmentDate: row_obj.appoinmentDate,
+ note: row_obj.note,
+ appoinmentSlots: row_obj.appoinmentSlots,
+ };
+ formValue.push(addFormData);
+ }else if(result.event == 'Update'){
+ console.log('Update')
+ formValue.push(row_obj);
+ }
+ else if(result == 'Delete'){
+ console.log('delete')
+ let val = {
+ isActive:0,
+ id: row_obj.id
+ }
+ formValue.push(val);
+ }
+
+ // var d = this.appoinmentsList.length+1
+ console.log(formValue[0])
+ this._app.addFormDetails(formValue[0]).subscribe(res => {
+ if (res.status == 200) {
+ // this.appoinmentsList = res.data;
+ if(this.user_role != 'FRONTDESK'){
+ let param ={"busId":localStorage.getItem('busId'),"userId":localStorage.getItem('user_id')}
+ console.log(param)
+ this.getAppoinmentsList(param)
+ }else{
+ let param ={"busId": localStorage.getItem('busId')}
+ console.log(param)
+ this.getAppoinmentsList(param)
+ }
+ if(result.event == 'Add'){
+ this.notifierService.notify('success', 'Appointment Added Successfully');
+ }else if(result.event == 'Update'){
+ this.notifierService.notify('success', 'Appointment Updated Successfully');
+ } else if(result == 'Delete'){
+ this.notifierService.notify('success', 'Appointment Deleted Successfully');
+ }
+ }
+ else{
+ this.notifierService.notify('warning', res.message);
+ }
+ }
+ // , error => {this.errorMessage = error});
+ ,error => {
+
+ });
+ }
+
+
+ getData(param){
+ console.log(param)
+
+ }
+
+ onClickList(){
+ this.router.navigate(['appointments']);
+ }
+
+
private initializeYesterday() {
this.yesterday = new Date();
this.yesterday.setDate(this.yesterday.getDate() - 1);
console.log( this.yesterday )
}
private initializeEvents() {
- let date = new Date("2023-02-26T11:26:30.882Z")
+ // let date = new Date("2023-02-26T11:26:30.882Z")
this.events = [
- {
- title: 'Editable event',
- color: colors.yellow,
- start: this.yesterday,
- actions: [
- {
- label: '',
- onClick: ({ event }: { event: CalendarEvent }): void => {
- console.log('Edit event', event);
- },
- },
- ],
- },
- {
- title: 'Editable event',
- color: colors.yellow,
- start: date,
- actions: [
- {
- label: '',
- onClick: ({ event }: { event: CalendarEvent }): void => {
- console.log('Edit event', event);
- },
- },
- ],
- },
- {
- title: 'Deletable event',
- color: colors.blue,
- start: date,
- actions: [
- {
- label: '',
- onClick: ({ event }: { event: CalendarEvent }): void => {
- this.events = this.events.filter((iEvent) => iEvent !== event);
- console.log('Event deleted', event);
- },
- },
- ],
- },
- {
- title: 'Non editable and deletable event',
- color: colors.red,
- start: this.yesterday,
- },
+ // {
+ // title: 'Editable event',
+ // color: colors.yellow,
+ // start: this.yesterday,
+ // actions: [
+ // {
+ // label: '',
+ // onClick: ({ event }: { event: CalendarEvent }): void => {
+ // console.log('Edit event', event);
+ // },
+ // },
+ // ],
+ // },
+ // {
+ // title: 'Editable event',
+ // color: colors.yellow,
+ // start: date,
+ // actions: [
+ // {
+ // label: '',
+ // onClick: ({ event }: { event: CalendarEvent }): void => {
+ // console.log('Edit event', event);
+ // },
+ // },
+ // ],
+ // },
+ // {
+ // title: 'Deletable event',
+ // color: colors.blue,
+ // start: date,
+ // actions: [
+ // {
+ // label: '',
+ // onClick: ({ event }: { event: CalendarEvent }): void => {
+ // this.events = this.events.filter((iEvent) => iEvent !== event);
+ // console.log('Event deleted', event);
+ // },
+ // },
+ // ],
+ // },
+ // {
+ // title: 'Non editable and deletable event',
+ // color: colors.red,
+ // start: this.yesterday,
+ // },
];
console.log( this.events )
}
dayClicked({date, events}: {date: Date, events: CalendarEvent[]}): void {
-console.log(date, events)
-this.openDialog('Add', {date:date})
-// this.openDialog('calender', {date:date})
-this.addEvent(date)
- if (isSameMonth(date, this.viewDate)) {
- if (
- (isSameDay(this.viewDate, date) && this.activeDayIsOpen === true) ||
- events.length === 0
- ) {
- this.activeDayIsOpen = false;
- } else {
- this.activeDayIsOpen = true;
- this.viewDate = date;
- }
- }
+ console.log(date, events)
+ //this.openDialog('Add', {date:date})
+ // this.openDialog('calender', {date:date})
+ // this.addEvent(date)
+ if (isSameMonth(date, this.viewDate)) {
+ if (
+ (isSameDay(this.viewDate, date) && this.activeDayIsOpen === true) ||
+ events.length === 0
+ ) {
+ this.activeDayIsOpen = false;
+ } else {
+ this.activeDayIsOpen = true;
+ this.viewDate = date;
+ }
+ }
}
eventTimesChanged({event, newStart, newEnd}: CalendarEventTimesChangedEvent): void {
@@ -203,115 +526,26 @@ this.addEvent(date)
this.dialogRef = null;
});
}
- openDialog(action,obj) {
- console.log(obj, action)
- if(action=='calender'){
-
- }else{
- obj.action = action;
- }
-
- const dialogRef = this.dialog.open(DialogBoxComponent, {
- width: '40%',
- height: '100%',
- // maxWidth: '38vw',
- position: { right: '0' },
- data:obj
- });
- dialogRef.afterClosed().subscribe(result => {
- console.log(result)
- if(result.event == 'Add'){
- this.addRowData(result.data);
- }else if(result.event == 'Update'){
- this.updateRowData(result.data);
- }else if(result.event == 'Delete'){
- this.deleteRowData(result.data);
- }
- });
- }
- addRowData(row_obj){
- var d = this.dataSource.data.length+1
- console.log(this.dataSource)
- console.log(row_obj)
- this.dataSource.data.push
- ({
- id: d,
- time: row_obj.time,
- booking: row_obj.booking,
- workspace: row_obj.workspace,
- service: row_obj.service,
- staff: row_obj.staff,
- customer: row_obj.customer,
- payment: row_obj.payment,
- status: row_obj.status,
- date: row_obj.date,
- note: row_obj.note,
-
- });
- this.table.renderRows();
- }
- updateRowData(row_obj){
- console.log(row_obj)
- this.dataSource = this.dataSource.data.filter((value,key)=>{
- if(value.id == row_obj.id){
- value.time = row_obj.time;
- value.booking = row_obj.booking;
- value.workspace = row_obj.workspace;
- value.service = row_obj.service;
- value.staff = row_obj.staff;
- value.customer = row_obj.customer;
- value.payment = row_obj.payment;
- value.status = row_obj.status;
- value.date = row_obj.date;
- value.note = row_obj.note;
- }
- return true;
- });
- }
- deleteRowData(row_obj){
- console.log(this.dataSource.data,row_obj)
- this.dataSource.data = this.dataSource.data.filter((value,key)=>{
- return value.booking != row_obj.booking
- });
- console.log(this.dataSource)
- }
- addEvent(dates): void {
+
+ addEvent(dates,enddate,bookingId): void {
+ console.log(dates,enddate)
console.log(startOfDay(new Date()));
console.log(endOfDay(new Date()))
this.events.push({
- title: 'New event',
- // start: startOfDay(new Date()),
- start: startOfDay(new Date(dates)),
- end: endOfDay(new Date(dates)),
- color: colors.red,
- draggable: true,
- resizable: {
- beforeStart: true,
- afterEnd: true
- }
- });
+ title: bookingId,
+ // start: startOfDay(new Date()),
+ start: startOfDay(new Date(dates)),
+ end: endOfDay(new Date(enddate)),
+ color: colors.red,
+ draggable: true,
+ resizable: {
+ beforeStart: true,
+ afterEnd: true
+ }
+ });
this.refresh.next();
}
- ngOnInit() {
- }
+
}
-// @Component({
-// selector: 'app-calendar-dialog',
-// template: `
-// ,
-// @Inject(MAT_DIALOG_DATA) public data: any) { }
-// }
+
diff --git a/ng-seed/src/app/appoinment/calendars/calendars.module.ts b/ng-seed/src/app/appoinment/calendars/calendars.module.ts
index 25cae2d..84622df 100644
--- a/ng-seed/src/app/appoinment/calendars/calendars.module.ts
+++ b/ng-seed/src/app/appoinment/calendars/calendars.module.ts
@@ -10,17 +10,10 @@ import { DemoMaterialModule } from 'app/shared/demo.module';
@NgModule({
declarations: [
- CalendarListComponent,
- CalendardialogComponent
+
],
imports: [
- DemoMaterialModule,
- CommonModule,
- CalendarsRoutingModule,
- CalendarModule.forRoot({
- provide: DateAdapter,
- useFactory: adapterFactory
- }),
+
]
})
export class CalendarsModule { }
diff --git a/ng-seed/src/app/appoinment/consultant-setting/add-skills/add-skills.component.html b/ng-seed/src/app/appoinment/consultant-setting/add-skills/add-skills.component.html
index 5692734..f92b829 100644
--- a/ng-seed/src/app/appoinment/consultant-setting/add-skills/add-skills.component.html
+++ b/ng-seed/src/app/appoinment/consultant-setting/add-skills/add-skills.component.html
@@ -26,14 +26,14 @@
- Skills {{i}}
+ Skills {{i+1}}
-
+
-
\ No newline at end of file
+
+
+
+
-
- Sure to delete {{local_data.cusName}}?
-
+
-
-
+
+
+
+
-
+ Business Details
-
+
+
+
+
+ Filter
+
+
+
+
+ Active
+
+
+
+
+
+
+ List
+ Calender
+
+
+
+
@@ -51,4 +56,5 @@
-
\ No newline at end of file
+
+Event action occurred
-//
-// Action:
-//
-// {{ data?.action }}
-//
-// Action:
-//
-// `
-// })
-// export class CalendarDialogComponent {
-// constructor(
-// public dialogRef: MatDialogRef{{ data?.action }}
-//
diff --git a/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.scss b/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.scss
index ad079c5..021902e 100644
--- a/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.scss
+++ b/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.scss
@@ -48,8 +48,9 @@
}
}
::ng-deep .mat-dialog-content {
- max-height: 170vh !important;
- overflow: hidden!important;
+ max-height: unset !important;
+ overflow: unset!important;
+ // overflow: hidden!important;
}
::ng-deep .mat-dialog-container{
overflow: hidden!important;
diff --git a/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.ts b/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.ts
index 94bb1a2..c478710 100644
--- a/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.ts
+++ b/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.ts
@@ -42,13 +42,13 @@ export class AssignServiceComponent implements OnInit {
submit(){
console.log(this.form.value)
- // let user_role = localStorage.getItem('user_role');
- // let user_id
- // if(user_role == 'FRONTDESK'){
- // user_id =
- // }else{
- let user_id = localStorage.getItem('user_id')
- // }
+ let user_role = localStorage.getItem('user_role');
+ let user_id
+ if(user_role == 'FRONTDESK'){
+ user_id = localStorage.getItem('practi_id')
+ }else{
+ user_id = localStorage.getItem('user_id')
+ }
let details:any = {
durationNew: this.form.value.duration,
fees:this.form.value.fees,
diff --git a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.scss b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.scss
index 3814350..775bb05 100644
--- a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.scss
+++ b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.scss
@@ -236,7 +236,8 @@ mat-tab-body {
background-color: #FAFAFA;
border-bottom: 1px solid #EFEFEF;
height: 63px;
- padding: 0 30px;
+ padding-right: 30px;
+ padding-left: 10px;
}
.staff-title{
diff --git a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.ts b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.ts
index 326b764..c14c0a8 100644
--- a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.ts
+++ b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.ts
@@ -138,11 +138,12 @@ image_view(image){
backRoute(param){
this.frontDeskHidden = param
+ this.getCosultantList()
}
redirectToSetting(practitiionerDetails){
console.log(practitiionerDetails)
- localStorage.setItem('user_id',practitiionerDetails.id)
+ localStorage.setItem('practi_id',practitiionerDetails.id)
this.frontDeskPractdetails = practitiionerDetails
this.frontDeskHidden = 0
this.getUsersList()
diff --git a/ng-seed/src/app/appoinment/customers/add-customers/add-customers.component.scss b/ng-seed/src/app/appoinment/customers/add-customers/add-customers.component.scss
index 07b61ed..ed5ecc1 100644
--- a/ng-seed/src/app/appoinment/customers/add-customers/add-customers.component.scss
+++ b/ng-seed/src/app/appoinment/customers/add-customers/add-customers.component.scss
@@ -48,9 +48,12 @@
}
}
::ng-deep .mat-dialog-content {
- max-height: 170vh!important;
+ max-height: unset !important;
+ overflow: unset!important;
+ // overflow: hidden!important;
+}
+::ng-deep .mat-dialog-container{
overflow: hidden!important;
-
}
.scrollHV {
height: calc(100vh - 150px);
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 0028ef9..1eb8c37 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
@@ -1,5 +1,5 @@
-
Filter
@@ -57,13 +57,13 @@
+
-
+
+
diff --git a/ng-seed/src/app/appoinment/mail/mail-log/mail-log.component.html b/ng-seed/src/app/appoinment/mail/mail-log/mail-log.component.html
index a59253c..119812e 100644
--- a/ng-seed/src/app/appoinment/mail/mail-log/mail-log.component.html
+++ b/ng-seed/src/app/appoinment/mail/mail-log/mail-log.component.html
@@ -9,7 +9,7 @@
-
+
Address is required
Limit exceed
-
+
State is required
Limit exceed
-
+
City is required
Limit exceed
-
+
City is required
Limit exceed
diff --git a/ng-seed/src/app/end-user/customer-info/customer-info.component.scss b/ng-seed/src/app/end-user/customer-info/customer-info.component.scss
index 811196e..7befee1 100644
--- a/ng-seed/src/app/end-user/customer-info/customer-info.component.scss
+++ b/ng-seed/src/app/end-user/customer-info/customer-info.component.scss
@@ -151,4 +151,12 @@ mat-toolbar{
.mat-dialog-container{
overflow: hidden !important;
padding: 32px !important;
+}
+
+footer {
+ background-color: #d1d1d1;
+ height:50px;
+ width: 100%;
+ position: absolute;
+ bottom: 0;
}
\ No newline at end of file
diff --git a/ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.ts b/ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.ts
index 723b910..ee4e421 100644
--- a/ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.ts
+++ b/ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.ts
@@ -48,6 +48,7 @@ export class DoctorProfileComponent implements OnInit {
console.log('booked', res);
if(res.length>0){
+ localStorage.setItem('busId',res[0].business[0].busId)
localStorage.setItem('busName',res[0].business[0].busName)
localStorage.setItem('logo',res[0].business[0].logo)
this.bookedAppointment = res[0].user[0]
diff --git a/ng-seed/src/app/end-user/payment/payment.component.html b/ng-seed/src/app/end-user/payment/payment.component.html
index 07c591b..8c549ab 100644
--- a/ng-seed/src/app/end-user/payment/payment.component.html
+++ b/ng-seed/src/app/end-user/payment/payment.component.html
@@ -52,6 +52,9 @@
-->
-
-
+
diff --git a/ng-seed/src/app/end-user/payment/payment.component.scss b/ng-seed/src/app/end-user/payment/payment.component.scss
index fbe7f09..a990288 100644
--- a/ng-seed/src/app/end-user/payment/payment.component.scss
+++ b/ng-seed/src/app/end-user/payment/payment.component.scss
@@ -48,4 +48,11 @@ mat-toolbar{
}
.mat-toolbar-single-row {
display: block !important;
-}
\ No newline at end of file
+}
+footer {
+ background-color: #d1d1d1;
+ height:50px;
+ width: 100%;
+ position: absolute;
+ bottom: 0;
+ }
\ No newline at end of file
diff --git a/ng-seed/src/app/end-user/service-list-details/service-list.component.ts b/ng-seed/src/app/end-user/service-list-details/service-list.component.ts
index 8f94d27..4923d98 100644
--- a/ng-seed/src/app/end-user/service-list-details/service-list.component.ts
+++ b/ng-seed/src/app/end-user/service-list-details/service-list.component.ts
@@ -82,6 +82,7 @@ export class ServiceListComponent implements OnInit {
this.full_data = res['data']
console.log(this.full_data)
this.full_data[0].business[0].busName
+ localStorage.setItem('busId',this.full_data[0].business[0].busId)
localStorage.setItem('busName',this.full_data[0].business[0].busName)
localStorage.setItem('currency',this.full_data[0].business[0].currency)
localStorage.setItem('logo',this.full_data[0].business[0].logo)
diff --git a/ng-seed/src/app/layouts/admin/admin-layout.component.html b/ng-seed/src/app/layouts/admin/admin-layout.component.html
index 34966ad..d139319 100644
--- a/ng-seed/src/app/layouts/admin/admin-layout.component.html
+++ b/ng-seed/src/app/layouts/admin/admin-layout.component.html
@@ -20,10 +20,23 @@
Customer Details
+Booking Details
+
\ No newline at end of file
diff --git a/ng-seed/src/app/end-user/booking-summary/booking-summary.component.scss b/ng-seed/src/app/end-user/booking-summary/booking-summary.component.scss
index c083a12..1a29755 100644
--- a/ng-seed/src/app/end-user/booking-summary/booking-summary.component.scss
+++ b/ng-seed/src/app/end-user/booking-summary/booking-summary.component.scss
@@ -54,4 +54,12 @@ mat-toolbar{
.scrollHV {
height: calc(100vh - 110px);
+ }
+
+ footer {
+ background-color: #d1d1d1;
+ height:50px;
+ width: 100%;
+ position: absolute;
+ bottom: 0;
}
\ No newline at end of file
diff --git a/ng-seed/src/app/end-user/customer-info/customer-info.component.html b/ng-seed/src/app/end-user/customer-info/customer-info.component.html
index 33912b3..c7ac76d 100644
--- a/ng-seed/src/app/end-user/customer-info/customer-info.component.html
+++ b/ng-seed/src/app/end-user/customer-info/customer-info.component.html
@@ -35,10 +35,10 @@
Please enter a valid email address
-
-
+ email is required
+
Email is required
-
+
@@ -62,28 +62,28 @@
- 
+
+
+
+ ![]()
+
+
+
+
+ camera_alt
+
+ {{getUserData.userName}}
+ - {{roleName}}
+
+