Merge branch 'master' of bitbucket.org:venbainformationtechnology/appointments_frontend

ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.html

@@ -67,10 +67,10 @@
                     <!-- <table mat-table [dataSource]="appointmentListSource" matSort *ngIf="appointmentListLength > 0" class="my-table mat-elevation-z8 len-table"> -->
                   
                       <!-- ID Column -->
-                      <!-- <ng-container matColumnDef="id">
+                      <ng-container matColumnDef="id">
                         <mat-header-cell *matHeaderCellDef mat-sort-header> S.No </mat-header-cell>
-                        <mat-cell *matCellDef="let row; let i = index;"> {{row.id}} </mat-cell>
+                        <mat-cell *matCellDef="let row; let i = index;"> {{row.index+1}} </mat-cell>
-                      </ng-container> -->
+                      </ng-container>
                   
 <!--                     
                       <ng-container matColumnDef="ClientName">

ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.ts

@@ -33,7 +33,7 @@ export interface UsersData {
 export class AppoinmentsListComponent implements OnInit {
 
   push: any;
-  displayedColumns: string[] = ['ClientName','datetime','phoneNo','email','address','status', 'action'];
+  displayedColumns: string[] = ['id','ClientName','datetime','phoneNo','email','address','status', 'action'];
   public appointmentListLength: number;
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
@@ -113,6 +113,11 @@ export class AppoinmentsListComponent implements OnInit {
           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
           this.appointmentListLength = filter.length;
@@ -124,6 +129,11 @@ export class AppoinmentsListComponent implements OnInit {
            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;
           console.log(this.appointmentListSource)

ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.html

@@ -66,7 +66,7 @@
         
       <mat-card class="cardDesign" *ngIf="show"> 
          <div class="innerdivs navStyle" fxLayoutAlign="center center"> 
-            <button mat-raised-button (click)="goToSlotBooking2()" style="background-color: #7fffd400;box-shadow: none;color:#fff" ><mat-icon style="cursor: pointer;">keyboard_arrow_left</mat-icon></button><span style="width: 150px;text-align: center;">12 thursday 2023</span><button mat-raised-button  (click)="goToSlotBooking()" *ngIf="clicks < 5" style="background-color: #7fffd400;box-shadow: none;color:#fff" ><mat-icon style="cursor: pointer;">keyboard_arrow_right</mat-icon></button>
+            <button type="button"  mat-raised-button (click)="goToSlotBooking2()" style="background-color: #7fffd400;box-shadow: none;color:#fff" ><mat-icon style="cursor: pointer;">keyboard_arrow_left</mat-icon></button><span style="width: 150px;text-align: center;">{{check(days)  | date:'longDate'}}</span><button mat-raised-button type="button" (click)="goToSlotBooking()" *ngIf="clicks < 5" style="background-color: #7fffd400;box-shadow: none;color:#fff" ><mat-icon style="cursor: pointer;">keyboard_arrow_right</mat-icon></button>
          </div>
          <div class="innerdivs2" > 
             <!-- <button  *ngFor="let slot of slots;let i=index" mat-raised-button class="mr-1 mt-1 hoverButton" [ngClass]="{'primary':slotIndex != i,'clickedSlot':slotIndex == i }  "  (click)="toggleActive($event,slot,i)" >{{slot | date:'shortTime'}}</button> -->

ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.ts

@@ -39,7 +39,8 @@ export class DialogBoxComponent implements OnInit {
   local_data:any;
   url: string | ArrayBuffer;
   heroes = ['Windstorm', 'Bombasto', 'Magneta', 'Tornado'];
-
+  days: any=[];
+  dayName:any=[];
 
   busname = new FormControl('', [Validators.required]);
   name = [
@@ -156,6 +157,16 @@ export class DialogBoxComponent implements OnInit {
       //   }
   
       // })
+      let tmp=[]
+      for(let i=0;i<=5;i++){
+        var someDate = new Date();
+        someDate.setDate(someDate.getDate() + i); //number  of days to add, e.x. 15 days
+        var dateFormated = someDate.toISOString().substr(0,10);
+        console.log(dateFormated);
+        tmp.push(dateFormated)
+      }
+      console.log(tmp)
+      this.days= tmp
       this.getSlots()
       let userId = localStorage.getItem('user_id')
       let busId = localStorage.getItem('busId')
@@ -233,12 +244,50 @@ export class DialogBoxComponent implements OnInit {
     if(this.clicks <5){
     this.clicks += 1;
     }
+    console.log( this.clicks)
+    console.log(this.days,this.days[ this.clicks], this.clicks)
+
+    let options:any = {  weekday: 'long'};
+    var prnDt = new Date(this.days[ this.clicks]).toLocaleTimeString('en-us', options);
+    var formatDate = prnDt.split(" ")
+ console.log(formatDate)
+
+ this.dayName = formatDate[0]
+ let userId = localStorage.getItem('user_id')
+ let params ={"id":userId , "day": this.dayName , "addcount": this.clicks}
+
+ this.end_user.getSlots(params).subscribe(res => {
+   if (res.status == 200) {
+     console.log(res)
+     let data = res['data'];
+     this.slots = data
+   }
+ })
   }
   goToSlotBooking2(){
   //  this.days[]
-    if(   this.clicks >0){
+    if(this.clicks >0){
     this.clicks -= 1;
     }
+    console.log( this.clicks)
+    console.log(this.days,this.days[ this.clicks], this.clicks)
+
+    let options:any = {  weekday: 'long'};
+    var prnDt = new Date(this.days[ this.clicks]).toLocaleTimeString('en-us', options);
+    var formatDate = prnDt.split(" ")
+ console.log(formatDate)
+
+ this.dayName = formatDate[0]
+ let userId = localStorage.getItem('user_id')
+ let params ={"id":userId , "day": this.dayName , "addcount": this.clicks}
+
+ this.end_user.getSlots(params).subscribe(res => {
+   if (res.status == 200) {
+     console.log(res)
+     let data = res['data'];
+     this.slots = data
+   }
+ })
   console.log( this.clicks)
   }
   check(param){
@@ -396,5 +445,8 @@ customerIdvalue(id){
   console.log(id)
   this.customerId = id
 }
+
+ 
+
     
 }

ng-seed/src/app/appoinment/business/business-list/business-list.component.html

@@ -20,7 +20,7 @@
       
                       <ng-container matColumnDef="id">
                         <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.id}} </td>
+                        <td mat-cell *matCellDef="let row; let i = index;" class="element-spc"> {{row.index+1}} </td>
                       </ng-container>
 
                       <ng-container matColumnDef="logo">

ng-seed/src/app/appoinment/business/business-list/business-list.component.ts

@@ -66,6 +66,11 @@ export class BusinessListComponent implements OnInit {
             console.log(this.businessListLength)
             this.businessList.sort((a: any, b: any) => {
               return b.id - a.id;
+            });
+            this.businessList.forEach((element, index) => {
+              element.index = index
+              
+              
             });
             this.businessListSource['data'] = this.businessList;
             console.log(this.businessListSource)

ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.ts

@@ -178,7 +178,7 @@ unavailability(action,obj) {
                   "qualification":null,
                   "days": null,
                   "languages": null,
-                  "workingHours": JSON.stringify([{"sunday":{"hours":[{"startTime":"09:30 am","endTime":"06:00 pm","day":"sunday","value":null}],"breaks":[]}},{"monday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"monday","value":null}],"breaks":[]}},{"tuesday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"tuesday","value":null}],"breaks":[]}},{"wednesday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"wednesday","value":null}],"breaks":[]}},{"thursday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"thursday","value":null}],"breaks":[]}},{"friday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"friday","value":null}],"breaks":[]}},{"saturday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"saturday","value":null}],"breaks":[]}}]),
+                  "workingHours": JSON.stringify( [{"sunday":{"hours":[],"breaks":[]}},{"monday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"monday","value":null}],"breaks":[]}},{"tuesday":{"hours":[],"breaks":[]}},{"wednesday":{"hours":[],"breaks":[]}},{"thursday":{"hours":[],"breaks":[]}},{"friday":{"hours":[],"breaks":[]}},{"saturday":{"hours":[],"breaks":[]}}]),
                   "dob": null,
                   "designtion": null,
                   "gender": null,
@@ -188,6 +188,24 @@ unavailability(action,obj) {
                   "isActive": "1",
                   
                 }]
+                let param;
+                let tmp =  [{"sunday":{"hours":[],"breaks":[]}},{"monday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"monday","value":null}],"breaks":[]}},{"tuesday":{"hours":[],"breaks":[]}},{"wednesday":{"hours":[],"breaks":[]}},{"thursday":{"hours":[],"breaks":[]}},{"friday":{"hours":[],"breaks":[]}},{"saturday":{"hours":[],"breaks":[]}}]
+               
+                    param ={practitionerId: this.usersList.id,workingHours:JSON.stringify(tmp)}
+                 
+               
+           
+            
+                this._api.createPractitionerInfo(param).subscribe(res => {
+                  if (res.status == 200) {
+                    console.log(res)
+                 
+                  }    
+                  else{
+                    
+                  }
+                } );
+
             }
             this.practitionerdetails = this.usersList['practitionerInfos'][0]
             this.practitionerdetails.skills = JSON.parse(this.practitionerdetails.skills)
@@ -226,7 +244,7 @@ unavailability(action,obj) {
   }
 
   hashPassword(password: string){
-    return "*".repeat(password.length)
+    return "*".repeat(6)
   }
   getAssignedList(busId) { 
     this._api.getAssignedDetails(busId).subscribe(res => {
@@ -362,6 +380,7 @@ unavailability(action,obj) {
     save(){
       this.isEditable = false;
       let userid = localStorage.getItem('user_id')
+      let tmp =  [{"sunday":{"hours":[],"breaks":[]}},{"monday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"monday","value":null}],"breaks":[]}},{"tuesday":{"hours":[],"breaks":[]}},{"wednesday":{"hours":[],"breaks":[]}},{"thursday":{"hours":[],"breaks":[]}},{"friday":{"hours":[],"breaks":[]}},{"saturday":{"hours":[],"breaks":[]}}]
       let  param: any = {  "exp": this.exp,
                     // "id": this.id,
                 "qualification": this.qualification,
@@ -370,7 +389,7 @@ unavailability(action,obj) {
                 "dob": this.dob,
                 "designtion": this.qualification,
                 "gender": this.gender,
-                "workingHours": JSON.stringify([{"sunday":{"hours":[{"startTime":"09:30 am","endTime":"06:00 pm","day":"sunday","value":null}],"breaks":[]}},{"monday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"monday","value":null}],"breaks":[]}},{"tuesday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"tuesday","value":null}],"breaks":[]}},{"wednesday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"wednesday","value":null}],"breaks":[]}},{"thursday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"thursday","value":null}],"breaks":[]}},{"friday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"friday","value":null}],"breaks":[]}},{"saturday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"saturday","value":null}],"breaks":[]}}]),
+                "workingHours": JSON.stringify( tmp),
                 "description": this.description,
                 "skills": JSON.stringify(this.skills),
                 "caption": this.caption,

ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.ts

@@ -171,14 +171,14 @@ export class EditWorkingHoursComponent implements OnInit {
     
      
         let sunday ={filters :this.data[0].sunday.hours }
-        for(let i=0;i<=this.data[0].sunday.hours.length-2;i++){
+        for(let i=0;i<=this.data[0].sunday.hours.length-1;i++){
           this.addFilterToFiltersFormArray()
           this.dynamicForm.patchValue(sunday)
         }
         // if(this.data[0].sunday.hours.length>1){
        
         // }
-     
+        this.dynamicForm.patchValue(sunday)
    
         // this.data[1].monday.hours.forEach(element => {
         //   element.value = null
@@ -190,6 +190,7 @@ export class EditWorkingHoursComponent implements OnInit {
           this.addFilterToFiltersFormArray2()
           this.dynamicForm2.patchValue(monday)
         }
+        this.dynamicForm2.patchValue(monday)
         // if(this.data[1].monday.hours.length>1){
         //   this.addFilterToFiltersFormArray2()
         // }
@@ -204,7 +205,7 @@ export class EditWorkingHoursComponent implements OnInit {
           this.addFilterToFiltersFormArray3()
           this.dynamicForm3.patchValue(tuesday)
         }
-     
+        this.dynamicForm3.patchValue(tuesday)
    
         let wednesday ={filters4 :this.data[3].wednesday.hours }
         // if(this.data[3].wednesday.hours.length>1){
@@ -216,7 +217,7 @@ export class EditWorkingHoursComponent implements OnInit {
          
         this.dynamicForm4.patchValue(wednesday)
          }
-     
+         this.dynamicForm4.patchValue(wednesday)
         let thursday ={filters5 :this.data[4].thursday.hours }
         // if(this.data[4].thursday.hours.length>1){
         //   this.addFilterToFiltersFormArray5()
@@ -227,7 +228,7 @@ export class EditWorkingHoursComponent implements OnInit {
          
         this.dynamicForm5.patchValue(thursday)
          }
-     
+         this.dynamicForm5.patchValue(thursday)
        // this.dynamicForm5.patchValue(thursday)
         let friday ={filters6 :this.data[5].friday.hours }
         // if(this.data[5].friday.hours.length>1){
@@ -241,7 +242,7 @@ export class EditWorkingHoursComponent implements OnInit {
         this.dynamicForm6.patchValue(friday)
          }
      
-      
+         this.dynamicForm6.patchValue(friday)
         let saturday ={filters7 :this.data[6].saturday.hours }
         // if(this.data[6].saturday.hours.length>1){
         //   this.addFilterToFiltersFormArray7()
@@ -253,7 +254,7 @@ export class EditWorkingHoursComponent implements OnInit {
       
         this.dynamicForm7.patchValue(saturday)
          }
-     
+         this.dynamicForm7.patchValue(saturday)
         // this.dynamicForm7.patchValue(saturday)
      
    // }, 2000);

ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.html

@@ -62,7 +62,7 @@
                     <!-- <table mat-table [dataSource]="customersListSource" matSort *ngIf="customersListLength > 0" class="my-table mat-elevation-z8 len-table">
                       <ng-container matColumnDef="id">
                         <mat-header-cell *matHeaderCellDef mat-sort-header> S.No </mat-header-cell>
-                        <mat-cell *matCellDef="let row; let i = index;"> {{row.id}} </mat-cell>
+                        <mat-cell *matCellDef="let row; let i = index;"> {{row.index+1}} </mat-cell>
                       </ng-container>
                   
                     

ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.ts

@@ -130,6 +130,11 @@ export class CustomersListComponent implements OnInit {
                 this.customersListLength = this.customersList.length;
                 this.customersList.sort((a: any, b: any) => {
                   return b.id - a.id;
+                });
+                this.customersList.forEach((element, index) => {
+                  element.index = index
+                  
+                  
                 });
                 this.customersListSource['data'] = this.customersList;      
               } else{
@@ -137,6 +142,11 @@ export class CustomersListComponent implements OnInit {
                 console.log(this.customersListLength)
                 this.customersList.sort((a: any, b: any) => {
                   return b.id - a.id;
+                });
+                this.customersList.forEach((element, index) => {
+                  element.index = index
+                  
+                  
                 });
                 this.customersListSource['data'] = this.customersList;
                 console.log(this.customersListSource)

ng-seed/src/app/appoinment/user/user-list/user-list.component.html

@@ -43,7 +43,7 @@
       
                       <ng-container matColumnDef="id">
                         <th mat-header-cell *matHeaderCellDef class="font-color"> S.No</th>
-                        <td mat-cell *matCellDef="let element" class="element-spc"> {{element.id}} </td>
+                        <td mat-cell *matCellDef="let element" class="element-spc"> {{element.index+1}} </td>
                       </ng-container>
                       <ng-container matColumnDef="logo">
                         <th mat-header-cell *matHeaderCellDef class="font-color"> Logo </th>

ng-seed/src/app/appoinment/user/user-list/user-list.component.ts

@@ -86,11 +86,17 @@ export class UserListComponent implements OnInit {
     this._use.getUsersListDetails(param).subscribe(res => {
       if (res.status == 200) {
         this.isLoading = false            
-         let usersList = res.data
+         let usersList:any = res.data
          usersList.sort((a: any, b: any) => {
           return b.id - a.id;
+        });
+        usersList.forEach((element, index) => {
+          element.index = index
+          
+          
         });
         this.usersList['data'] = usersList;
+       
         this.usersListLength = res.data.length;
         this.recordStatus=false;
       }

ng-seed/src/app/dashboard/dashboard.component.scss

@@ -86,7 +86,7 @@ $p: 12px;
 }
 
 .avatar {
-    background: url('assets/images/1.jpg') no-repeat center center / cover;
+    background: url('~assets/images/1.jpg') no-repeat center center / cover;
     clip-path: polygon(0 0, 100% 0, 100% 75%, 0% 100%);
 }
 

ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.html

@@ -161,4 +161,4 @@
      </div>
   </div>
  </div> -->
-<ngx-spinner bdColor = "rgba(0, 0, 0, 0.8)" size = "medium" color = "#178a78" type = "square-jelly-box" [fullScreen] = "true"><p style="color: white" > Please Wait...... </p></ngx-spinner>
+<!-- <ngx-spinner bdColor = "rgba(0, 0, 0, 0.8)" size = "medium" color = "#178a78" type = "square-jelly-box" [fullScreen] = "true"><p style="color: white" > Please Wait...... </p></ngx-spinner> -->

ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.ts

@@ -18,7 +18,7 @@ export class DoctorProfileComponent implements OnInit {
   skillsDetails: any = [];
  
   constructor(private router:Router,public end_user:EndUserService,private spinner:NgxSpinnerService) {
-    this.spinner.show()
+    // this.spinner.show()
    }
 
   ngOnInit(): void {
@@ -47,10 +47,10 @@ export class DoctorProfileComponent implements OnInit {
         console.log(URL_AS_LIST);
       //  this.router.navigate(['customer/business/'+URL_AS_LIST[3]])
           }
-          setTimeout(() => {
+          // setTimeout(() => {
-            /** spinner ends after 5 seconds */
+          //   /** spinner ends after 5 seconds */
-            this.spinner.hide();
+          //   this.spinner.hide();
-          }, 1000);
+          // }, 1000);
     })
   }
 

ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.ts

@@ -4,6 +4,7 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { Router } from '@angular/router';
 import * as moment from 'moment';
 import { EndUserService } from '../end-user.service';
+ 
 
 @Component({
   selector: 'app-slot-booking-details',
@@ -47,6 +48,7 @@ export class SlotBookingDetailsComponent implements OnInit {
   bookedAppointment:any=[];
   bookedAppointmentSlot: any=[];
   days: any=[];
+  dayName:any=[];
   busName: any =[];
   doctor: any=[];
   servicesName: any=[];
@@ -295,9 +297,24 @@ export class SlotBookingDetailsComponent implements OnInit {
     if(   this.clicks <5){
       this.clicks += 1;
     }
-    
+    console.log(this.days,this.days[ this.clicks], this.clicks)
 
- 
+    let options:any = {  weekday: 'long'};
+    var prnDt = new Date(this.days[ this.clicks]).toLocaleTimeString('en-us', options);
+    var formatDate = prnDt.split(" ")
+ console.log(formatDate)
+
+ this.dayName = formatDate[0]
+
+ let params ={"id":this.user.id , "day": this.dayName , "addcount": this.clicks}
+
+ this.end_user.getSlots(params).subscribe(res => {
+   if (res.status == 200) {
+     console.log(res)
+     let data = res['data'];
+     this.slots = data
+   }
+ })
 
     }
     goToSlotBooking2(){
@@ -306,7 +323,25 @@ export class SlotBookingDetailsComponent implements OnInit {
         this.clicks -= 1;
      }
       console.log( this.clicks)
-      
+    
+      console.log(this.days,this.days[ this.clicks], this.clicks)
+
+      let options:any = {  weekday: 'long'};
+      var prnDt = new Date(this.days[ this.clicks]).toLocaleTimeString('en-us', options);
+      var formatDate = prnDt.split(" ")
+   console.log(formatDate)
+  
+   this.dayName = formatDate[0]
+  
+   let params ={"id":this.user.id , "day": this.dayName , "addcount": this.clicks}
+  
+   this.end_user.getSlots(params).subscribe(res => {
+     if (res.status == 200) {
+       console.log(res)
+       let data = res['data'];
+       this.slots = data
+     }
+   })
   
    
   

ng-seed/src/assets/styles/scss/components/_custom.scss

@@ -417,7 +417,7 @@ $hover-font-color:#fff;
             text-align: center;
             background-color: rgba(214, 224, 226, 0.2);
             .cardheader {
-                background: url("assets/images/night.jpg");
+                background: url("~assets/images/night.jpg");
                 background-size: cover;
                 height: 135px;
             }
@@ -469,7 +469,7 @@ $hover-font-color:#fff;
 }
 
 .profile-cover {
-    background-image: url("/assets/images/night.jpg");
+    background-image: url("~assets/images/night.jpg");
     background-position: center center;
     background-size: cover;
     padding: 7rem 0;

ng-seed/src/environments/environment.ts

@@ -10,8 +10,8 @@ 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.12:8080/api/',
+  apiEndpoint:'http://192.168.1.28:8080/api/',
-//  apiEndpoint:'https://api.venbait.in/api/',
+   //apiEndpoint:'https://api.venbait.in/api/',
   
   //EndUser URL
   endUserUrl:'https://venbainfotech.com/appointment/#/customer/',