From fd2d3155c811c77f0d5986aa4b0f1afe89be2bc3 Mon Sep 17 00:00:00 2001
From: bitbucket <bitbucket@venbainfotech.com>
Date: Tue, 25 Apr 2023 12:43:45 +0530
Subject: [PATCH] consult issue fixed

---
 .../appoinments-list.component.html           |  2 +-
 .../consultant-setting.component.html         |  2 +-
 .../consultant-setting.component.scss         |  2 +-
 .../consultant-setting.component.ts           | 29 +++++++++++++++++--
 .../customers-list.component.html             |  4 +--
 .../service-list/service-list.component.html  |  4 +--
 .../service-list/service-list.component.ts    | 12 ++++++++
 .../slot-booking-details.component.html       |  6 ++--
 .../slot-booking-details.component.scss       |  3 +-
 .../slot-booking-details.component.ts         |  9 +++++-
 .../menu-items/horizontal-menu-items.ts       |  2 +-
 .../src/app/shared/menu-items/menu-items.ts   |  2 +-
 ng-seed/src/environments/environment.ts       |  4 +--
 ng-seed/src/index.html                        |  2 +-
 14 files changed, 65 insertions(+), 18 deletions(-)

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 dfabb98..5b8b90c 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
@@ -56,7 +56,7 @@
 
                       <ng-container matColumnDef="address">
                         <th mat-header-cell *matHeaderCellDef class="font-color">  Client Address </th>
-                        <td mat-cell *matCellDef="let row" class="element-spc"> {{row.customer[0].address_1}}, {{row.customer[0].city}}, {{row.customer[0].state}}</td>
+                        <td mat-cell *matCellDef="let row" class="element-spc"> {{row.customer[0].address_1}} {{row.customer[0].city}} {{row.customer[0].state}}</td>
                       </ng-container>
 
                       <ng-container matColumnDef="status">
diff --git a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.html b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.html
index 245043f..34c980b 100644
--- a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.html
+++ b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.html
@@ -111,7 +111,7 @@
          <span class="staff-title">
          Profile
          </span>
-         <button mat-icon-button matTooltip="Edit"  *ngIf="isEditable == false" (click)="edit_table(isEditable)" fileName="customers"><mat-icon >edit</mat-icon></button>
+         <button mat-icon-button matTooltip="Edit" style="padding: 4px 20px !;" *ngIf="isEditable == false" (click)="edit_table(isEditable)" fileName="customers"><mat-icon >edit</mat-icon></button>
          <!-- <button mat-icon-button  *ngIf="table[0].statement == statement_item && table[0].statement != 'Cash Flow Statement'" color="accent" matTooltip="Edit" matTooltipPosition="right" (click)="editandcancel(true,table[0].section)" ><mat-icon>edit</mat-icon></button> -->
          <button mat-icon-button  color="accent"  *ngIf="isEditable == true"  (click)="edit_table(isEditable)" matTooltip="Cancel" matTooltipPosition="right"  ><mat-icon>cancel_presentation</mat-icon></button>
          <button mat-icon-button  color="accent"  *ngIf="isEditable == true" (click)="save()"  matTooltip="Submit" matTooltipPosition="right"  ><mat-icon>done</mat-icon></button>
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 0a6417c..a307397 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
@@ -88,7 +88,7 @@ h5{
     color: #efefef;
     border: none;
     text-align: center;
-    padding: 10px 20px;
+    padding: 4px 20px;
     border-radius: 25px;
     // margin-left: 4rem;
     margin-top: 1rem;
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 8f11efc..6f8351a 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
@@ -266,7 +266,7 @@ unavailability(action,obj) {
             
             if(this.userRole == 'PRACTITIONER'){
               this.endUserURL = this.end_User_Url+'practitioner/'+this.usersList.randStr+"/details"
-            } else if (this.userRole == 'BADMIN'){
+            } else if (this.userRole == 'BADMIN' || this.userRole == 'FRONTDESK'  ){
               this.endUserURL = this.end_User_Url+'business/'+this.usersList['BusinessDetails'][0].randStr
             }
             
@@ -302,6 +302,13 @@ unavailability(action,obj) {
       console.log(res)
           if (res.status == 200) {
             this.servicesList = res.data;  
+       
+            let result =  this.servicesList.filter((obj, index, self) =>
+            index === self.findIndex((t) => (
+                t.serviceId === obj.serviceId
+            ))
+        );
+        this.servicesList = result
           } 
         } );
   }
@@ -312,6 +319,7 @@ unavailability(action,obj) {
     this._api.getServicesListDetails(id,busId).subscribe(res => {
           if (res.status == 200) {
             this.servicesList_data = res.data;
+            console.log(this.servicesList_data)
             res['data'].forEach(element => {
               // tmp.push(element.service)
               element.service.forEach(e => {
@@ -320,6 +328,18 @@ unavailability(action,obj) {
                 this.assignService.push(e.servicesName)
               });  
             });
+
+        //     this.servicesList_array =  this.servicesList_array.filter((obj, index, self) =>
+        //     index === self.findIndex((t) => (
+        //         t.serviceId === obj.serviceId
+        //     ))
+        // );
+        //     let result =  this.assignService.filter((obj, index, self) =>
+        //     index === self.findIndex((t) => (
+        //         t.serviceId === obj.serviceId
+        //     ))
+        // );
+        // this.assignService = result
             console.log(this.servicesList_array)
           } 
           this.getAssignedList(this.usersList.busId)
@@ -454,11 +474,16 @@ unavailability(action,obj) {
                 "gender": this.gender,
                 "workingHours": JSON.stringify( tmp),
                 "description": this.description,
-               "skills": this.skills,
+                "skills": JSON.stringify(this.skills),
                 "caption": this.caption,
                 "userName": this.userName,
                 "practitionerId":userid
             }
+             
+              if(this.userRole == 'BADMIN'){
+               delete param.skills
+              }
+           
                 if(this.usersList['practitionerInfos'].length>0) {
                   param.id = this.id
                 }
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 2369aa4..4df56b3 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
@@ -15,7 +15,7 @@
   <div class="main-content" fxLayout="row" fxLayoutAlign="center start">
     <div fxFlex.gt-sm="90" fxFlex.gt-xs="95" fxFlex="100">
        <div class="messages-list material fullscreen">
-          <!-- <mat-accordion> -->
+          <mat-accordion *ngIf="!recordStatus">
              <!-- <mat-expansion-panel>
                 <mat-expansion-panel-header > -->
                   <!-- <div class="example-container mat-elevation-z8 "> -->
@@ -121,7 +121,7 @@
                   <!-- </div> -->
                   <!-- </mat-expansion-panel-header>
                   </mat-expansion-panel> -->
-                  <!-- </mat-accordion> -->
+                  </mat-accordion>
                  
                 <mat-card-content *ngIf="recordStatus">
                       <h5 align="center" style="font-weight: bold;
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
index f789440..d2ccc6b 100644
--- 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
@@ -19,7 +19,7 @@
   <div class="main-content" fxLayout="row" fxLayoutAlign="center start">
     <div fxFlex.gt-sm="90" fxFlex.gt-xs="95" fxFlex="100">
        <div class="messages-list material fullscreen">
-          <mat-accordion>
+          <mat-accordion *ngIf="!recordStatus">
              <!-- <mat-expansion-panel>
                 <mat-expansion-panel-header > -->
                   <!-- <div class="example-container mat-elevation-z8 "> -->
@@ -28,7 +28,7 @@
       
                       <ng-container matColumnDef="serviceId">
                         <th mat-header-cell *matHeaderCellDef class="font-color mat-no"> S.No</th>
-                        <td mat-cell *matCellDef="let row; let i = index;" class="element-spc"> {{row.serviceId}} </td>
+                        <td mat-cell *matCellDef="let row; let i = index;" class="element-spc"> {{row.index+1}} </td>
                       </ng-container>
 
                       <ng-container matColumnDef="servicesName">
diff --git a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts b/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts
index e6ef778..146907c 100644
--- a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts
+++ b/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts
@@ -104,6 +104,17 @@ export class ServiceListComponent implements OnInit {
             this.servicesList.sort((a: any, b: any) => {
               return b.serviceId - a.serviceId;
             });
+            this.servicesList.forEach((element, index) => {
+              element.index = index
+              
+              
+            });
+            let result =  this.servicesList.filter((obj, index, self) =>
+            index === self.findIndex((t) => (
+                t.serviceId === obj.serviceId
+            ))
+        );
+        this.servicesList = result
             this.servicesListSource['data'] = this.servicesList;
             console.log(this.servicesListSource)
             this.recordStatus=false;
@@ -111,6 +122,7 @@ export class ServiceListComponent implements OnInit {
           else{
             this.isLoading = false;
             this.servicesList=[];
+            this.servicesListSource['data'] = this.servicesList;
             this.servicesListLength= null;
             this.recordStatus=true;
           }
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 26417e9..ad0c4ba 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
@@ -58,7 +58,8 @@
          <mat-card class="card-mat">
             <div fxLayout="row wrap  mt-2">
                <div  fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" class="p-gap">
-                  <h4> Slot Availability</h4>
+                  <h4>Pick Appointment Time For <span style="color: #cc7424;border-bottom-color: #cc7424;">{{check(days)  | date:'longDate'}} </span></h4>
+                     
                </div>
             </div>
             <div fxLayout="row wrap" style="height:100%;">
@@ -195,7 +196,7 @@
                      <p class="param"><img src="assets/images/person.svg" alt="Avatar" class="img"> Practitioner </p>
                      <span class="span-text">Dr. {{doctor}}</span>
                      <p class="param"><img src="assets/images/information.svg" alt="Avatar" class="img"> Service </p>
-                     <span class="span-text"> {{servicesName.servicesName}} ({{serviceMapdetails[0].duration.length>0 ? serviceMapdetails[0].duration[0].durationNew:serviceMapdetails[0].service[0].duration
+                     <span class="span-text" *ngIf="serviceMapdetails.length>0"> {{servicesName.servicesName}} ({{serviceMapdetails[0].duration.length>0 ? serviceMapdetails[0].duration[0].durationNew:serviceMapdetails[0].service[0].duration
                      }} Mins)</span>
                      <!-- <p  class="text-color d-flex align-items-start" >
                         <img src="assets/images/information.svg" alt="Avatar" class="img" /> 
@@ -209,6 +210,7 @@
                      <p class="param"><img src="assets/images/Location.svg" alt="Avatar" class="img">Amount : </p>
                      <span class="span-text"><span class="ex" style="font-size: 17px;padding-bottom: 10px;line-height: 17px;">&#x20b9;</span> {{   serviceMapdetails[0].duration.length>0 ? serviceMapdetails[0].duration[0].fees:serviceMapdetails[0].service[0].fees}}</span>
                      <div>
+                        <hr>
                         <button mat-raised-button mat-button-sm  class="mr-1 mb-1 mt-1 btn-red" [ngStyle]="{'background':slot_array.length ==0 ? '#ccc':'#4caf50' }" [disabled]="slot_array.length ==0" (click)="submit()">PROCEED</button>
                      </div>
                   </div>
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 9a6534b..d529388 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
@@ -164,7 +164,8 @@ margin-left: -3rem!important;
 }
 h4{
     color: #227f6e;
-    margin: 0;
+    margin: 5px;
+
 }
 .scrollHV {
     height: calc(100vh - 338px);
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 248427f..6fd9d96 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
@@ -42,7 +42,7 @@ export class SlotBookingDetailsComponent implements OnInit {
   ];
   workingHours: any;
   getHours: any;
-  slots: any[];
+  slots: any=[];
   public Currentdate: Date;
   slotIndex: any;
   bookedAppointment:any=[];
@@ -192,6 +192,13 @@ export class SlotBookingDetailsComponent implements OnInit {
       this.serviceMapdetails =  this.serviceMapdetails.filter(arr=>{return arr.serviceId == serviceDetails.serviceId }) 
        
       console.log(   this.serviceMapdetails) 
+      if(this.serviceMapdetails.length===0){
+        let URL = this.router.url;
+        console.log(URL)
+        let URL_AS_LIST = URL.split('/');
+        console.log(URL_AS_LIST);
+        this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]+'/details'])
+      }
    // this.form.controls['note'].setValue('Sample')
     this.form.patchValue(this.local_data)
   }
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 8548210..d9debe1 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
@@ -96,7 +96,7 @@ const HORIZONTALMENUITEMS = [
   },
   {
     state: 'consultant-setting',
-    name: 'My Settings',
+    name: 'Settings',
     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 e585ff7..8bc8c42 100644
--- a/ng-seed/src/app/shared/menu-items/menu-items.ts
+++ b/ng-seed/src/app/shared/menu-items/menu-items.ts
@@ -104,7 +104,7 @@ const MENUITEMS : Menu[] = [
   },
   {
     state: 'consultant-setting',
-    name: 'My Settings',
+    name: 'Settings',
     type: 'link',
     icon: 'settings_system_daydream'
   },
diff --git a/ng-seed/src/environments/environment.ts b/ng-seed/src/environments/environment.ts
index e27364f..c04253a 100644
--- a/ng-seed/src/environments/environment.ts
+++ b/ng-seed/src/environments/environment.ts
@@ -10,9 +10,9 @@ export const environment = {
 //  apiEndpoint:'http://192.168.1.20:8080/api/',
 // apiEndpoint:'https://api.venbait.in/api/', 
   // apiEndpoint:'http://venbainfotech.com:5000/api/', 
- apiEndpoint:'http://192.168.1.3:8080/api/',
+//  apiEndpoint:'http://192.168.1.3:8080/api/',
 
-//  apiEndpoint:'https://api.venbait.in/api/',
+ apiEndpoint:'https://api.venbait.in/api/',
   
   //EndUser URL
   endUserUrl:'https://venbainfotech.com/appointment/#/customer/',
diff --git a/ng-seed/src/index.html b/ng-seed/src/index.html
index a80bce8..8ed61d6 100644
--- a/ng-seed/src/index.html
+++ b/ng-seed/src/index.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <base href="/">
+    <base href="./">
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">