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

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

@@ -30,6 +30,10 @@
                 <mat-expansion-panel-header > -->
                   <!-- <div class="example-container mat-elevation-z8 "> -->
                     <table  mat-table  [dataSource]="appointmentListSource" #mytable class="my-table mat-elevation-z8 len-table">
+                      <ng-container matColumnDef="id">
+                        <th mat-header-cell *matHeaderCellDef class="font-color mat-no"> S.No</th>
+                        <td mat-cell *matCellDef="let row" class="element-spc"> {{row.index+1  }}</td>
+                      </ng-container>
                       <ng-container matColumnDef="ClientName">
                         <th mat-header-cell *matHeaderCellDef class="font-color mat-no"> Client Name</th>
                         <td mat-cell *matCellDef="let row" class="element-spc"> {{row.customer[0].cusName || null  }}</td>
@@ -57,7 +61,10 @@
 
                       <ng-container matColumnDef="status">
                         <th mat-header-cell *matHeaderCellDef class="font-color mat-mob"> Status </th>
-                        <td mat-cell *matCellDef="let row" class="element-spc"> {{row.status == 0 ? 'Booked':'Cancelled'}}</td>
+                        <td mat-cell *matCellDef="let row" class="element-spc"  [ngClass]="{
+                          'positive' :row.status == 'Booked',
+                          'negative' : row.status != 'Booked'
+                       }"> {{row.status}}</td>
                       </ng-container>
 
                       <ng-container matColumnDef="action">

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

@@ -115,3 +115,13 @@ tr.mat-header-row {
   overflow: auto;
   max-height: 500px;
 }
+
+.positive {
+color: green;
+font-weight: bold;
+}
+
+.negative {
+color: rgb(230, 174, 21);
+font-weight: bold;
+}

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;

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

@@ -114,6 +114,16 @@
          <textarea matInput rows="5" cols="40" placeholder="Description" formControlName="note"></textarea>
       </mat-form-field>  -->
 
+      <mat-form-field appearance="outline"  class="mat-pane" *ngIf="action == 'Update'">
+
+         <mat-label>Status</mat-label>
+         <mat-select placeholder="Select Status" formControlName="status" required>
+           <mat-option *ngFor="let details of Status"  [value]="details.value"> 
+            {{details.value}}                 
+           </mat-option>
+         </mat-select>
+       </mat-form-field>
+
       <div class="notes">
          <input type="checkbox" id="scales" name="scales" checked>
          <label for="scales">Send notifications for customer</label>

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

@@ -103,6 +103,7 @@ export class DialogBoxComponent implements OnInit {
   ServiceId: any;
   user_role: string;
   consultants: any = [];
+  Status:any = [{id:1,value:"Consult"},{id:2,value:"Attend"},{id:1,value:"No Show"},{id:1,value:"Cancel"}]
   constructor(private notifierService: NotifierService,private router: Router,private formBuilder: FormBuilder, public _cus:CustomersService,
     public dialogRef: MatDialogRef<DialogBoxComponent>,public _api:ConsultantService, public _con:ConsultantService,
     @Inject(MAT_DIALOG_DATA) public data: UsersData,public _app:AppointmentsService,public end_user:EndUserService) {
@@ -190,7 +191,7 @@ export class DialogBoxComponent implements OnInit {
         customer: new FormControl('', [Validators.required]),
         // note: new FormControl('', [Validators.required]),
 
-      
+        status: new FormControl('', null),
         
        
         appoinmentSlots: new FormControl('', [Validators.required]),
@@ -278,6 +279,7 @@ export class DialogBoxComponent implements OnInit {
           }
           if(this.local_data.hasOwnProperty('id')){
             paramsData.id =this.local_data.id
+            paramsData.status =this.form.value.status
           }
           console.log(paramsData)
            this._app.addFormDetails(paramsData).subscribe(res => {

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

@@ -11,7 +11,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 "> -->

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

@@ -78,6 +78,7 @@ export class BusinessListComponent implements OnInit {
           } 
           else{
             this.isLoading = false
+            this.businessListSource['data'] = []
             this.businessList=[];
             this.businessListLength= null;
             this.recordStatus=true;

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

@@ -23,7 +23,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="name">

ng-seed/src/environments/environment.ts

@@ -10,7 +10,7 @@ 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.20:8080/api/',
+ apiEndpoint:'http://192.168.1.3:8080/api/',
 
 //  apiEndpoint:'https://api.venbait.in/api/',