diff --git a/ng-seed/Appointment_Frontend_Build.zip b/ng-seed/Appointment_Frontend_Build.zip index 53602ee..d1a4631 100644 Binary files a/ng-seed/Appointment_Frontend_Build.zip and b/ng-seed/Appointment_Frontend_Build.zip differ diff --git a/ng-seed/src/app/app.routing.ts b/ng-seed/src/app/app.routing.ts index c03f17e..9f88f02 100644 --- a/ng-seed/src/app/app.routing.ts +++ b/ng-seed/src/app/app.routing.ts @@ -21,7 +21,7 @@ export const AppRoutes: Routes = [{ loadChildren: () => import('./appoinment/business/business.module').then(m => m.BusinessModule) }, { - path: 'appoinments', + path: 'appointments', loadChildren: () => import('./appoinment/appoinments/appoinments.module').then(m => m.AppoinmentsModule) }, diff --git a/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.html b/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.html index fb25c46..78d661f 100644 --- a/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.html +++ b/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.html @@ -13,10 +13,13 @@ {{details.userName}} - - + + + List + Calender + + + 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 fdf70d4..99150c4 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 @@ -134,4 +134,12 @@ tr.mat-header-row { .cancelStatus { color: red; font-weight: bold; +} + +::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/appoinments/appoinments-list/appoinments-list.component.ts b/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.ts index 6b97763..32cb217 100644 --- a/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.ts +++ b/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.ts @@ -9,6 +9,7 @@ import { environment } from 'environments/environment'; import Swal from 'sweetalert2'; import { AppointmentsService } from '../appointments-service/appointments.service'; import { DialogBoxComponent } from '../dialog-box/dialog-box.component'; +import { Router } from '@angular/router'; export interface UsersData { busId: number; appoinmentTime: string; @@ -58,7 +59,7 @@ export class AppoinmentsListComponent implements OnInit { consultants: any = []; selectPractitioner:any = []; user_role: any=[]; - constructor(private notifierService: NotifierService,public dialog: MatDialog, public _app:AppointmentsService) { } + constructor(private router: Router,private notifierService: NotifierService,public dialog: MatDialog, public _app:AppointmentsService) { } ngOnInit(): void { this.recordStatus=false; @@ -267,7 +268,7 @@ export class AppoinmentsListComponent implements OnInit { }); dialogRef.afterClosed().subscribe(result => { console.log(result) - if(result == 0){ + if(result.data == 0){ if(this.user_role != 'FRONTDESK'){ let param ={"busId":localStorage.getItem('busId'),"userId":localStorage.getItem('user_id')} console.log(param) @@ -407,5 +408,9 @@ export class AppoinmentsListComponent implements OnInit { } + onClickCalender(){ + this.router.navigate(['appointments/calender-view']); + } + } diff --git a/ng-seed/src/app/appoinment/appoinments/appoinments-routing.module.ts b/ng-seed/src/app/appoinment/appoinments/appoinments-routing.module.ts index 7fecc09..7ccf868 100644 --- a/ng-seed/src/app/appoinment/appoinments/appoinments-routing.module.ts +++ b/ng-seed/src/app/appoinment/appoinments/appoinments-routing.module.ts @@ -1,6 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { AppoinmentsListComponent } from './appoinments-list/appoinments-list.component'; +import { CalendarListComponent } from '../calendars/calendar-list/calendar-list.component'; const routes: Routes = [ { @@ -8,6 +9,10 @@ const routes: Routes = [ path: '', component: AppoinmentsListComponent + }, + { + path: 'calender-view', + component: CalendarListComponent } ]; diff --git a/ng-seed/src/app/appoinment/appoinments/appoinments.module.ts b/ng-seed/src/app/appoinment/appoinments/appoinments.module.ts index fdf477f..7003225 100644 --- a/ng-seed/src/app/appoinment/appoinments/appoinments.module.ts +++ b/ng-seed/src/app/appoinment/appoinments/appoinments.module.ts @@ -11,7 +11,12 @@ import { DemoMaterialModule } from 'app/shared/demo.module'; import { NgScrollbarModule } from 'ngx-scrollbar'; import { NotifierModule, NotifierOptions } from 'angular-notifier'; import { DataTableModule } from 'ornamentum'; -import { AppointmentAddcustomerComponent } from './appointment-addcustomer/appointment-addcustomer.component' +import { AppointmentAddcustomerComponent } from './appointment-addcustomer/appointment-addcustomer.component'; + +import { CalendarModule, DateAdapter } from 'angular-calendar'; +import { adapterFactory } from 'angular-calendar/date-adapters/date-fns'; +import { CalendarListComponent } from '../calendars/calendar-list/calendar-list.component'; +import { CalendardialogComponent } from '../calendars/calendardialog/calendardialog.component'; // import CalendarTodayIcon from '@material-ui/icons/CalendarToday'; @@ -60,7 +65,9 @@ const customNotifierOptions: NotifierOptions = { declarations: [ AppoinmentsListComponent, DialogBoxComponent, - AppointmentAddcustomerComponent + AppointmentAddcustomerComponent, + CalendarListComponent, + CalendardialogComponent ], imports: [ DemoMaterialModule, @@ -71,7 +78,15 @@ const customNotifierOptions: NotifierOptions = { // ScrollingModule, NgScrollbarModule, NotifierModule.withConfig(customNotifierOptions), - DataTableModule.forRoot() + DataTableModule.forRoot(), + CalendarModule.forRoot({ + provide: DateAdapter, + useFactory: adapterFactory + }), + + + + ] }) diff --git a/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.ts b/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.ts index 9cca50a..efaa038 100644 --- a/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.ts +++ b/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.ts @@ -478,7 +478,8 @@ export class DialogBoxComponent implements OnInit { }else{ this.notifierService.notify('success', 'Appointment Added Successfully'); } - this.dialogRef.close(0); + let param = {data:0,response:res} + this.dialogRef.close(param); } }) } 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 @@ --> -

+ + List + Calender +

+ + {{ viewDate | calendarDate:(view + 'ViewTitle'):'en' }} - {{ viewDate | calendarDate:(view + 'ViewTitle'):'en' }} +
-
+ @@ -51,4 +56,5 @@
- \ No newline at end of file + + \ 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: ` -//
Event action occurred
-//
-// Action: -// 
{{ data?.action }}
-//
-//
-// Action: -// 
{{ data?.action }}
-//
-// ` -// }) -// export class CalendarDialogComponent { -// constructor( -// public dialogRef: MatDialogRef, -// @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/end-user/booking-summary/booking-summary.component.html b/ng-seed/src/app/end-user/booking-summary/booking-summary.component.html index b4b4c52..3c895c1 100644 --- a/ng-seed/src/app/end-user/booking-summary/booking-summary.component.html +++ b/ng-seed/src/app/end-user/booking-summary/booking-summary.component.html @@ -149,4 +149,9 @@ - \ No newline at end of file + +
+

+ © 2023 Venba Information Technology Pvt Ltd. All Rights Reserved +

+
\ 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 de53c1b..3d08419 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 @@ -62,28 +62,28 @@
- + 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/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 @@
--> - - +
+

+ © 2023 Venba Information Technology Pvt Ltd. All Rights Reserved +

+
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/layouts/admin/admin-layout.component.html b/ng-seed/src/app/layouts/admin/admin-layout.component.html index 34966ad..da96a4e 100644 --- a/ng-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng-seed/src/app/layouts/admin/admin-layout.component.html @@ -23,7 +23,7 @@
{{getUserData.userName}}
-
({{getUserData.role}})
+
{{getUserData.role}}