From 1f44738ce44521a31e3fe33208a7ecf85ec3b9cc Mon Sep 17 00:00:00 2001 From: Smart Date: Tue, 11 Apr 2023 11:57:59 +0530 Subject: [PATCH 1/2] slot --- .../slot-booking-details.component.html | 149 +++++++++- .../slot-booking-details.component.scss | 254 +++++++++++++++++- .../slot-booking-details.component.ts | 5 + ng-seed/src/assets/images/information.svg | 1 + ng-seed/src/assets/images/person.svg | 1 + 5 files changed, 394 insertions(+), 16 deletions(-) create mode 100644 ng-seed/src/assets/images/information.svg create mode 100644 ng-seed/src/assets/images/person.svg 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 index 69979bf..f750e6e 100644 --- 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 @@ -1,4 +1,4 @@ - + - - + - + + + + + Appointment + +
+
+
+ +
+
+

Slot Availability

+
+
+
+
+
+

Teero would like to schedule an interview with you! Pick a time & date.

+
+
+ + + +

AvatarOostelijk Handelskade 879

+ 1020BD - Amsterdam, Netherlands +

AvatarChristain Wicks

+ christain@teero.com +

+ Avatar + This is an on-site interview. Please bring your CV and any other document required for work contract.

+ +
+
+
+
+
+
+ Today + Monday + April05 +
+ + +
+
+ +
+
+
+
+ Tomorrow + Tuesday + April05 +
+ +
+ +
+
+
+
+ Next Week + Wednesday + April05 +
+ +
+ +
+
+
+
+ + Thursday + April05 +
+ +
+ +
+
+
+
+ + Friday + April05 +
+ + +
+ +
+
+ + +
+
+ + +
-
+ + 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 index ad1f827..25dcfaa 100644 --- 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 @@ -1,3 +1,145 @@ +// $color_red_orange_approx: #107c14; +// $white: #fff; +// $black_10: rgba(0, 0, 0, 0.1); +// $black_30: rgba(0, 0, 0, 0.3); +// $icon-size: 3rem; +// $icon-color: #D8D8D8; +// $main-color: #f44336; +// $tem-color : #217e69; +// .toggleSize{ +// width: 12rem; +// height: 4rem; +// border-radius: 5px !important; +// } +// [mat-raised-button][mat-button-sm] { +// font-size: 15px; +// line-height: 45px; +// padding: 0 20px; +// } +// .hoverButton{ +// background: $white; +// // box-shadow: 0 2px 6px $tem-color; +// transition: all 0.1s ease-in-out 0s; +// &:hover { +// box-shadow: 0 0 21px $tem-color; + +// transform: scale(1.05); +// } +// } +// .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: #4caf50 !important; +// color: $white; +// // border: 1px solid $color_red_orange_approx; +// float: right; +// } +// .clickedSlot{ +// color: white !important; +// background-color: brown !important; +// cursor: pointer !important; +// width: 6rem; +// } +// .bookedSlot{ +// background-color: darkgrey; +// color: white; +// width: 6rem; +// cursor: no-drop !important; +// } +// .primary{ +// background-color: #00866e00; +// color: brown; +// width: 6rem; +// border: 1px solid brown; +// cursor: pointer; +// } +// ::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; +// } + +// mat-toolbar{ +// background-color: #227f6e; +// color:#fff; +// } +// .container{ +// max-width: 1217px; +// min-width: 375px; +// margin: 0 auto; +// // margin-right: 0rem; +// } +// .flx{ +// flex: 1 1 0%!important; +// display: initial!important; +// } +// .card-mat{ +// // max-width: 100%; +// min-width: -webkit-fill-available; +// padding: 1rem !important; +// } +// @media only screen and (max-width: 600px) { +// h3{ +// font-size: 20px; +// margin-top: 2rem; +// } +// .card-mat{ +// max-width: 95%; +// } +// .container{ +// display: flow-root!important; +// } +// .img { +// margin-right: 2rem; +// margin-left: 1rem; +// } +// .img-sun{ +// margin-right: 2rem; +// } +// .img-set{ +// margin-right: 2rem; +// } +// } +// ::ng-deep body{ +// background-color: #f7f8f5 !important; +// } +// .dateTime{ +// margin:0 !important; +// color: #0087ba; +// font-weight: 600; +// } +// .datecolor{ +// color: black !important; +// font-weight: 500 !important; +// } + + $color_red_orange_approx: #107c14; $white: #fff; $black_10: rgba(0, 0, 0, 0.1); @@ -11,17 +153,15 @@ $tem-color : #217e69; height: 4rem; border-radius: 5px !important; } -[mat-raised-button][mat-button-sm] { - font-size: 15px; - line-height: 45px; - padding: 0 20px; +[mat-raised-button][mat-button-sm] { + padding: 0 ; } .hoverButton{ background: $white; // box-shadow: 0 2px 6px $tem-color; transition: all 0.1s ease-in-out 0s; &:hover { - box-shadow: 0 0 21px $tem-color; + box-shadow: 0 0 8px $tem-color; transform: scale(1.05); } @@ -51,11 +191,14 @@ margin-left: -3rem!important; // border: 1px solid $color_red_orange_approx; float: right; } +.cursor{ + cursor: pointer !important; +} .clickedSlot{ color: white !important; background-color: brown !important; cursor: pointer !important; - width: 6rem; + width: auto; } .bookedSlot{ background-color: darkgrey; @@ -66,7 +209,7 @@ margin-left: -3rem!important; .primary{ background-color: #00866e00; color: brown; - width: 6rem; + width: auto; border: 1px solid brown; cursor: pointer; } @@ -130,11 +273,104 @@ margin-left: -3rem!important; background-color: #f7f8f5 !important; } .dateTime{ - margin:0 !important; + // margin:0 !important; color: #0087ba; font-weight: 600; } .datecolor{ color: black !important; font-weight: 500 !important; -} \ No newline at end of file +} +.inline{ + border-bottom: 1px solid #ccc; +} +.img{ + width: 20px; + margin-right: 1.5rem; +} +.param{ + font-size: 14px; + font-weight: 600; + // margin-left: 2rem; + margin-bottom: 8px; +} +.span-text{ + font-size: 14px; + font-weight: 500; + margin-left: 2.8rem; + color: #7a7a7a; +} +.text-color{ + color: #7a7a7a; +} +h4{ + color: #227f6e;; +} +.scrollHV { + height: calc(100vh - 105px); +} +.flexxx{ + flex-direction: column; + display: flex; + // margin-top: 1rem; + // border-top:1px solid #ccc; +} +.days{ + // color: #000; + font-size: 14px; + font-weight: 600; + padding-bottom: 5px; + padding-top: 5px; +} + .today-days{ + font-size: 14px; + color: #7a7a7a; + } + .margin-days{ + color: #000; + margin-top: 20px!important; + } + +.daytime{ + cursor: pointer; + // float: left; + display: block; + // color: #f2f2f2; + text-align: center; + padding: 14px 16px; + text-decoration: none; + // font-size: 17px; +} + + .line-day{ + border-top: 1px solid #ccc; + width: 683%; + margin-top: 23px; + } +.mat-margin{ + margin-top: 23px; +} +.activeday{ + padding: 5px; + border-radius: 5px; +} +.daytime .activeday:hover { + // background: #7a7a7a; + box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2); + transition: 0.3s; + // padding: 5px; + // color: #7a7a7a; + } + .phase-active{ + background-color: #cef1eb !important; + color: #227f6e; + // color: #7a7a7a; + } +// .phase-active:hover { +// box-shadow: 0 4px 8px 0 rgba(228, 12, 12, 0.2); +// transition: 0.3s; +// // color: #7a7a7a; +// } + + + \ No newline at end of file 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 index 93330e6..8156300 100644 --- 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 @@ -12,6 +12,7 @@ import { EndUserService } from '../end-user.service'; providers:[DatePipe] }) export class SlotBookingDetailsComponent implements OnInit { + activeButton minDate: Date; maxDate: Date; chooseDate:Date | null; @@ -171,6 +172,10 @@ export class SlotBookingDetailsComponent implements OnInit { // console.log(this.form.value); // } + showdays(event){ + this.activeButton = event; + } + toggleActive(event:any,param:any,i:any){ console.log(event,param,i) // debugger; diff --git a/ng-seed/src/assets/images/information.svg b/ng-seed/src/assets/images/information.svg new file mode 100644 index 0000000..90c1952 --- /dev/null +++ b/ng-seed/src/assets/images/information.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ng-seed/src/assets/images/person.svg b/ng-seed/src/assets/images/person.svg new file mode 100644 index 0000000..5e061cc --- /dev/null +++ b/ng-seed/src/assets/images/person.svg @@ -0,0 +1 @@ + \ No newline at end of file From 585d82b88c72ca7040bfd86e8bdec6dd29b33170 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Tue, 11 Apr 2023 13:00:54 +0530 Subject: [PATCH 2/2] consult error issue fixed --- .../add-business/add-business.component.ts | 2 +- .../business-list/business-list.component.ts | 2 +- .../consultant-setting.component.ts | 16 ++++++++++++++++ ng-seed/src/environments/environment.ts | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ng-seed/src/app/appoinment/business/add-business/add-business.component.ts b/ng-seed/src/app/appoinment/business/add-business/add-business.component.ts index bda1e66..60e474b 100644 --- a/ng-seed/src/app/appoinment/business/add-business/add-business.component.ts +++ b/ng-seed/src/app/appoinment/business/add-business/add-business.component.ts @@ -121,7 +121,7 @@ export class AddBusinessComponent implements OnInit { this.formData.append('state', tmp.state); this.formData.append('city', tmp.city); console.log(this.formData) - this.dialogRef.close({event:this.action,data:this.formData}); + this.dialogRef.close({event:this.action,data:this.formData,admincheck:tmp.admin_checked}); // console.log(this.form.value); // console.log(this.action,this.local_data) } 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 7006546..641d935 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 @@ -188,7 +188,7 @@ export class BusinessListComponent implements OnInit { if (res.status == 200) { // this.customersList = res.data; this.getBusinessList() - if(result.event == 'Add' && row_obj.admin_checked == true){ + if(result.event == 'Add' && result.admincheck == true){ localStorage.setItem('go_admin','0') localStorage.setItem('busName',row_obj.busName) this.router.navigate(['/users',]) 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 296992a..efe2c19 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 @@ -125,6 +125,22 @@ workingDialog(action,obj) { if (res.status == 200) { this.usersList = res.data[0]; console.log(this.usersList) + if(this.usersList['practitionerInfos'].length==0){ + this.usersList['practitionerInfos'] =[ + { + + "exp":null, + "qualification":null, + "days": null, + "languages": null, + "workingHours": "[{\"sunday\":{\"hours\":[{\"startTime\":\"09:30 am\",\"endTime\":\"09:30 pm\",\"day\":\"sunday\",\"value\":null}],\"breaks\":[]}},{\"monday\":{\"hours\":[{\"startTime\":\"09:00 am\",\"endTime\":\"09:30 pm\",\"day\":\"monday\",\"value\":null}],\"breaks\":[]}},{\"tuesday\":{\"hours\":[{\"startTime\":\"09:00 am\",\"endTime\":\"12:00 am\",\"day\":\"tuesday\",\"value\":null},{\"startTime\":\"01:00 pm\",\"endTime\":\"04:00 pm\",\"day\":null},{\"startTime\":\"05:00 pm\",\"endTime\":\"09:00 pm\",\"day\":null}],\"breaks\":[]}},{\"wednesday\":{\"hours\":[{\"startTime\":\"09:00 am\",\"endTime\":\"09:30 am\",\"day\":\"wednesday\",\"value\":null}],\"breaks\":[]}},{\"thursday\":{\"hours\":[{\"startTime\":\"09:00 am\",\"endTime\":\"09:30 am\",\"day\":\"thursday\",\"value\":null}],\"breaks\":[]}},{\"friday\":{\"hours\":[{\"startTime\":\"09:00 am\",\"endTime\":\"09:30 am\",\"day\":\"friday\",\"value\":null}],\"breaks\":[]}},{\"saturday\":{\"hours\":[{\"startTime\":\"09:00 am\",\"endTime\":\"09:30 am\",\"day\":\"saturday\",\"value\":null}],\"breaks\":[]}}]", + "dob": null, + "designtion": null, + "gender": null, + "isActive": "1", + + }] + } this.practitionerdetails = this.usersList['practitionerInfos'][0] this._con.getPractitionerInfo.next( this.usersList['practitionerInfos']); console.log(this.practitionerdetails) diff --git a/ng-seed/src/environments/environment.ts b/ng-seed/src/environments/environment.ts index b7a2721..7aeef88 100644 --- a/ng-seed/src/environments/environment.ts +++ b/ng-seed/src/environments/environment.ts @@ -7,7 +7,7 @@ export const environment = { production: false, environmentName: 'Testing Environment',//Localhost Environment. // apiEndpoint:'http://venbainfotech.com:5000/api/', -apiEndpoint:'http://192.168.1.20:8080/api/', +apiEndpoint:'http://192.168.1.17:8080/api/', // apiEndpoint:'https://api.venbait.in/api/', firebase: {