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 fc3a782..2fb464e 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
@@ -28,8 +28,8 @@ h5{
display: flex !important;
}
-.scrollHV {
- height: calc(100vh - 105px);
+.scrollHVtab1 {
+ height: calc(100vh - 200px);
}
.consultant-list-card {
border-radius: 10px;
@@ -338,8 +338,8 @@ margin: 30px 25px 30px 30px;
margin-top: 4px;
margin-left: 10px;
}
- .scrollHV {
- height: calc(100vh - 190px);
+ .scrollHVtab2 {
+ height: calc(100vh - 205px);
}
.add-button{
border: 1px solid #50497F;
@@ -354,10 +354,7 @@ margin: 30px 25px 30px 30px;
.dis-font{
font-size: 15px;
}
- .mat-tab-body-content {
- height: 100%;
- overflow: hidden!important;
- }
+
.margin{
margin-bottom: 10rem;
}
@@ -382,11 +379,9 @@ margin: 30px 25px 30px 30px;
// }
//mat-tab3start
-.assignService{
- .scrollHV {
- height: calc(100vh - 461px) !important;
- }
-}
+
+
+
.p-1{
padding: 1rem !important;
.flexCard{
@@ -584,9 +579,7 @@ padding-top: 13px;
box-sizing: border-box;
line-height: 15px;
}
-.scrollHV {
-height: calc(100vh - 240px);
-}
+
::ng-deep .mat-form-field-infix {
height: 50px!important;
}
@@ -640,4 +633,13 @@ content: "\20B9";
.scrollHV2{
height: calc(100vh - 305px);
+}
+
+::ng-deep .mat-tab-body-content {
+ height: 100%;
+ overflow:hidden !important;
+}
+
+.scrollHVtab3 {
+ height: calc(100vh - 190px) !important;
}
\ No newline at end of file
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 947a4b3..3f19dce 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
@@ -268,9 +268,9 @@ unavailability(action,obj) {
this._con.getPractitionerInfo.next( this.usersList['practitionerInfos']);
console.log(this.practitionerdetails)
- if(this.userRole == 'PRACTITIONER'){
+ if(this.userRole == 'PRACTITIONER' || this.userRole == 'FRONTDESK'){
this.endUserURL = this.end_User_Url+'practitioner/'+this.usersList.randStr+"/details"
- } else if (this.userRole == 'BADMIN' || this.userRole == 'FRONTDESK' ){
+ } else if (this.userRole == 'BADMIN'){
this.endUserURL = this.end_User_Url+'business/'+this.usersList['BusinessDetails'][0].randStr
}
diff --git a/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.ts b/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.ts
index 846eddc..d91461e 100644
--- a/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.ts
+++ b/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.ts
@@ -12,6 +12,24 @@ import { ConsultantService } from "../consultant-service/consultant.service";
})
export class EditWorkingHoursComponent implements OnInit {
startTimes:any = [
+ "12:00 am",
+ "12:30 am",
+ "01:00 am",
+ "01:30 am",
+ "02:00 am",
+ "02:30 am",
+ "03:00 am",
+ "03:30 am",
+ "04:00 am",
+ "04:30 am",
+ "05:00 am",
+ "05:30 am",
+ "06:00 am",
+ "06:30 am",
+ "07:00 am",
+ "07:30 am",
+ "08:00 am",
+ "08:30 am",
"09:00 am",
"09:30 am",
"10:00 am",
@@ -37,8 +55,31 @@ export class EditWorkingHoursComponent implements OnInit {
"08:00 pm",
"08:30 pm",
"09:00 pm",
+ "09:30 pm",
+ "10:00 pm",
+ "10:30 pm",
+ "11:00 pm",
+ "11:30 pm",
];
endTimes = [
+ "12:00 am",
+ "12:30 am",
+ "01:00 am",
+ "01:30 am",
+ "02:00 am",
+ "02:30 am",
+ "03:00 am",
+ "03:30 am",
+ "04:00 am",
+ "04:30 am",
+ "05:00 am",
+ "05:30 am",
+ "06:00 am",
+ "06:30 am",
+ "07:00 am",
+ "07:30 am",
+ "08:00 am",
+ "08:30 am",
"09:00 am",
"09:30 am",
"10:00 am",
@@ -46,8 +87,8 @@ export class EditWorkingHoursComponent implements OnInit {
"11:00 am",
"11:30 am",
"12:00 pm",
- "12:30 pm",
- "01:00 pm",
+ "12:30 pm",
+ "01:00 pm",
"01:30 pm",
"02:00 pm",
"02:30 pm",
@@ -64,6 +105,11 @@ export class EditWorkingHoursComponent implements OnInit {
"08:00 pm",
"08:30 pm",
"09:00 pm",
+ "09:30 pm",
+ "10:00 pm",
+ "10:30 pm",
+ "11:00 pm",
+ "11:30 pm",
];
days = [
"Sunday",
diff --git a/ng-seed/src/app/appoinment/customers/add-customers/add-customers.component.html b/ng-seed/src/app/appoinment/customers/add-customers/add-customers.component.html
index ebda3f3..8d88fd0 100644
--- a/ng-seed/src/app/appoinment/customers/add-customers/add-customers.component.html
+++ b/ng-seed/src/app/appoinment/customers/add-customers/add-customers.component.html
@@ -23,7 +23,7 @@
-
+
Contact No is required
Invalid Contact No
Contact No must be at least 10 characters
diff --git a/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.ts b/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.ts
index 4bef798..701ba16 100644
--- a/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.ts
+++ b/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.ts
@@ -8,6 +8,7 @@ import { AppointmentsService } from 'app/appoinment/appoinments/appointments-ser
import Swal from 'sweetalert2';
import { AddCustomersComponent } from '../add-customers/add-customers.component';
import { CustomersService } from '../customers-service/customers.service';
+import { local } from 'd3';
export interface UsersData {
@@ -111,8 +112,8 @@ export class CustomersListComponent implements OnInit {
}
getCustomerDetails(){
-
- this._cus.getCustomersListDetails().subscribe(res => {
+ let param = {"busId": localStorage.getItem('busId')}
+ this._cus.getCustomersListDetails(param).subscribe(res => {
if (res.status == 200) {
this.isLoading = false
this.customersList = res.data;
@@ -123,7 +124,6 @@ export class CustomersListComponent implements OnInit {
const activeIds = this.appoinmentsIds
const serviceList = this.customersList
console.log(activeIds,serviceList)
-
const result = serviceList.filter(({id}) => activeIds.includes(id));
console.log(result)
this.customersList = result
@@ -132,8 +132,7 @@ export class CustomersListComponent implements OnInit {
return b.id - a.id;
});
this.customersList.forEach((element, index) => {
- element.index = index
-
+ element.index = index
});
this.customersListSource['data'] = this.customersList;
@@ -145,8 +144,6 @@ export class CustomersListComponent implements OnInit {
});
this.customersList.forEach((element, index) => {
element.index = index
-
-
});
this.customersListSource['data'] = this.customersList;
console.log(this.customersListSource)
diff --git a/ng-seed/src/app/appoinment/customers/customers-service/customers.service.ts b/ng-seed/src/app/appoinment/customers/customers-service/customers.service.ts
index 061e98f..a747b9a 100644
--- a/ng-seed/src/app/appoinment/customers/customers-service/customers.service.ts
+++ b/ng-seed/src/app/appoinment/customers/customers-service/customers.service.ts
@@ -12,14 +12,15 @@ export class CustomersService {
private apiUrl = environment.apiEndpoint;
constructor(private _http: HttpClient) { }
- getCustomersListDetails(): Observable {
- console.log('IN')
- return this._http.get(this.apiUrl + "getCustomersDetails")
+ getCustomersListDetails(param): Observable {
+ return this._http.post(this.apiUrl + "getCustomersDetails",param)
// .pipe(
// catchError(this.handleError('role', []))
// )
}
+
+
addFormDetails(addParams): Observable {
return this._http.post(this.apiUrl + 'CreateCustomers', addParams)
// .pipe(
diff --git a/ng-seed/src/app/appoinment/front-desk/consultant-list/consultant-list.component.html b/ng-seed/src/app/appoinment/front-desk/consultant-list/consultant-list.component.html
index b9f6c0e..6171277 100644
--- a/ng-seed/src/app/appoinment/front-desk/consultant-list/consultant-list.component.html
+++ b/ng-seed/src/app/appoinment/front-desk/consultant-list/consultant-list.component.html
@@ -9,7 +9,7 @@
Search practitioner
-
+
search
@@ -30,7 +30,7 @@