UI Fix

2023-05-24 18:54:39 +05:30 · 2023-05-24 18:54:39 +05:30 · 8607f2aa21
commit 8607f2aa21
parent 6865e50991
17 changed files with 8593 additions and 12637 deletions
--- a/ng-seed/package-lock.json
+++ b/ng-seed/package-lock.json
--- 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
@ -44,7 +44,7 @@

                      <ng-container matColumnDef="datetime">
                        <th mat-header-cell *matHeaderCellDef class="font-color th-mat"> Date and Time </th>
-                        <td mat-cell *matCellDef="let row"> {{row.appoinmentDate | date:'dd-MMM-YYYY'}}<br> {{row.appoinmentSlots[0] | date:'shortTime'}} </td>
+                        <td mat-cell *matCellDef="let row"> {{row.appoinmentDate | date:'dd-MMM-YYYY'}}<br> {{row.appoinmentSlots[0] | date:'shortTime'}} -  {{row.appoinmentSlots[row.appoinmentSlots.length-1] | date:'shortTime'}} </td>
                      </ng-container>

                      <ng-container matColumnDef="phoneNo">
--- a/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.html
+++ b/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.html
@ -17,10 +17,10 @@
         <mat-error *ngIf="service.hasError('invalidValue')">Please choose any other</mat-error>
      </mat-form-field>  -->

-      <mat-form-field  appearance="outline" class="mat-pane">
+      <!-- <mat-form-field  appearance="outline" class="mat-pane">
         <mat-label>Business</mat-label>
         <input  matInput placeholder="Business" name="Business"   formControlName="busname" readonly>        
-       </mat-form-field> 
+       </mat-form-field>  -->
       <mat-form-field  appearance="outline" class="mat-pane" *ngIf="user_role != 'FRONTDESK'">
         <mat-label>Practitioner</mat-label>
         <input  matInput placeholder="practitioner" name="practitioner"   formControlName="practitioner" readonly>        
--- a/ng-seed/src/app/appoinment/business/business-list/business-list.component.html
+++ b/ng-seed/src/app/appoinment/business/business-list/business-list.component.html
@ -1,11 +1,24 @@

 <h3>Business Details</h3>
-<mat-form-field style="width:30%">
-  <mat-label>Filter</mat-label>
-  <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Type Here" #input>
-</mat-form-field>
-<mat-checkbox class="example-margin" (change)="setAll($event.checked)">Click here to see Inactive List</mat-checkbox>
-<button mat-button (click)="openDialog('Add',{})"   class="button">Add Business</button>
+<div fxLayout="row wrap">
+  <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="30" fxFlex.lg="30" fxFlex.xl="30" class="m-gap p-gap" fxLayoutAlign="start center" >
+    <mat-form-field style="width:100%">
+      <mat-label>Filter</mat-label>
+      <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Type Here" #input>
+    </mat-form-field>
+  </div>
+  <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="55" fxFlex.lg="55" fxFlex.xl="55" class="m-gap p-gap" fxLayoutAlign="end center" >
+    <span>Active 
+      <mat-slide-toggle class="example-margin" 
+      (change)="onToggleChange($event.checked)"></mat-slide-toggle> Inactive</span> 
+      <!-- <mat-checkbox class="example-margin" (change)="setAll($event.checked)">Click here to see Inactive List</mat-checkbox> -->
+  </div>
+  <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="15" fxFlex.lg="15" fxFlex.xl="15" class="m-gap p-gap" fxLayoutAlign="end center">    
+    <button mat-button (click)="openDialog('Add',{})"   class="button">Add Business</button>
+  </div>
+</div>
+
+
    <!-- <div class="example-container mat-elevation-z8 "> -->
 <mat-sidenav-container class="app-inner background-none shadow-none mail-db">
  
--- a/ng-seed/src/app/appoinment/business/business-list/business-list.component.scss
+++ b/ng-seed/src/app/appoinment/business/business-list/business-list.component.scss
@ -8,6 +8,7 @@
    float: right;
    background-color: #4caf50;
    color: #ffff;
+    height: 35px;
 }
 th.mat-header-cell, td.mat-cell, td.mat-footer-cell {
    padding: 6px;
--- 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
@ -303,10 +303,16 @@ export class BusinessListComponent implements OnInit {
    return this.apiUrl+'imageViewer?img_name='+image;
  }

-  setAll(check) {
-    console.log(check)
-    this.activeAndInactive = check
-    this.getBusinessList()
+//   setAll(check) {
+//     console.log(check)
+//     this.activeAndInactive = check
+//     this.getBusinessList()
+//  }
+
+ onToggleChange(event){
+  console.log(event) 
+  this.activeAndInactive = event
+  this.getBusinessList()
 }

 }
--- a/ng-seed/src/app/appoinment/consultant-setting/add-skills/add-skills.component.html
+++ b/ng-seed/src/app/appoinment/consultant-setting/add-skills/add-skills.component.html
@ -26,14 +26,14 @@
    <ng-scrollbar class="scrollHV">    
    <div *ngFor="let phone of getPhonesFormControls(); let i = index">
      <mat-form-field class="example-full-width" style="width: 85%;">
-        <mat-label>Skills {{i}}</mat-label>
+        <mat-label>Skills {{i+1}}</mat-label>
        <input type="text" matInput   placeholder="Skills"  [formControl]="phone" required>
      </mat-form-field>   
      <!-- <input [formControl]="phone" type="text"> -->
    <button type="button" mat-mini-fab color="warn" (click)="removeSkills(i)"><mat-icon>remove</mat-icon></button>    
    </div>
   
-    <div style="text-align: end;"><button type="button" mat-mini-fab color="warn" (click)="addSkills()"> <mat-icon>add</mat-icon></button></div>
+    <div style="text-align: end;"><button style="margin-right: 13px;" type="button" mat-mini-fab color="warn" (click)="addSkills()"> <mat-icon>add</mat-icon></button></div>
 </ng-scrollbar>
    <div mat-dialog-actions>
        <button mat-button type="submit" class="mat-green"  mat-raised-button >Add</button>
--- a/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.ts
+++ b/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.ts
@ -42,13 +42,13 @@ export class AssignServiceComponent implements OnInit {

  submit(){
      console.log(this.form.value)
-      // let user_role = localStorage.getItem('user_role');
-      // let user_id
-      // if(user_role == 'FRONTDESK'){
-        // user_id = 
-      // }else{
-       let user_id = localStorage.getItem('user_id')
-      // }      
+      let user_role = localStorage.getItem('user_role');
+      let user_id
+      if(user_role == 'FRONTDESK'){
+        user_id = localStorage.getItem('practi_id')
+      }else{
+        user_id = localStorage.getItem('user_id')
+      }      
      let details:any = {
        durationNew: this.form.value.duration,
        fees:this.form.value.fees,
--- 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
@ -138,11 +138,12 @@ image_view(image){

 backRoute(param){
  this.frontDeskHidden = param
+  this.getCosultantList()
 }

  redirectToSetting(practitiionerDetails){
      console.log(practitiionerDetails)
-      localStorage.setItem('user_id',practitiionerDetails.id)
+      localStorage.setItem('practi_id',practitiionerDetails.id)
      this.frontDeskPractdetails = practitiionerDetails
      this.frontDeskHidden = 0
      this.getUsersList()
--- a/ng-seed/src/app/appoinment/user/user-list/user-list.component.html
+++ b/ng-seed/src/app/appoinment/user/user-list/user-list.component.html
@ -1,9 +1,24 @@
 
 <h3>Users Details</h3>
-<mat-form-field style="width:30%">
-  <mat-label>Filter</mat-label>
-  <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Type Here" #input>
-</mat-form-field>
+<div fxLayout="row wrap">
+  <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="30" fxFlex.lg="30" fxFlex.xl="30" class="m-gap p-gap" fxLayoutAlign="start center" >
+    <mat-form-field style="width:100%">
+      <mat-label>Filter</mat-label>
+      <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Type Here" #input>
+    </mat-form-field>
+  </div>
+  <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="55" fxFlex.lg="55" fxFlex.xl="55" class="m-gap p-gap" fxLayoutAlign="end center" >
+    <span>Active 
+      <mat-slide-toggle class="example-margin" 
+      (change)="onToggleChange($event.checked)"></mat-slide-toggle> Inactive</span> 
+      <!-- <mat-checkbox class="example-margin" (change)="setAll($event.checked)">Click here to see Inactive List</mat-checkbox> -->
+    </div>
+  <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="15" fxFlex.lg="15" fxFlex.xl="15" class="m-gap p-gap" fxLayoutAlign="end center">    
+    <button mat-button (click)="openDialog('Add',{})"   class="button">Add Users</button>
+  </div>
+</div>
+
+
 <!-- <mat-form-field appearance="outline"  style="width:20%;margin-left: 5%;">
  <mat-label>Business</mat-label>
  <mat-select placeholder="Select Business" formControlName="businessselect" required>
@ -24,8 +39,7 @@
      <mat-option  value="BIZADMIN" (click)="applyFilter('BIZADMIN')">BIZADMIN</mat-option>
  </mat-select> 
 </mat-form-field> -->
-<mat-checkbox class="example-margin" (change)="setAll($event.checked)">Click here to see Inactive List</mat-checkbox>
-<button mat-button (click)="openDialog('Add',{})"   class="button">Add Users</button>
+
    <!-- <div class="example-container mat-elevation-z8 "> -->

 
@ -54,11 +68,11 @@
                        <td mat-cell *matCellDef="let element"> {{element.role}} </td>
                      </ng-container>

-                      <ng-container matColumnDef="busId">
+                      <!-- <ng-container matColumnDef="busId">
                        <th mat-header-cell *matHeaderCellDef class="font-color th-mat"> Business Name </th>
                        <td mat-cell *matCellDef="let element"> {{element.BusinessDetails.length>0 ? element.BusinessDetails[0].busName : null }}</td>
                        
-                      </ng-container>
+                      </ng-container> -->
                      
                      <ng-container matColumnDef="Username">
                        <th mat-header-cell *matHeaderCellDef class="font-color"> User Name </th>
--- a/ng-seed/src/app/appoinment/user/user-list/user-list.component.scss
+++ b/ng-seed/src/app/appoinment/user/user-list/user-list.component.scss
@ -5,9 +5,10 @@
  height: calc(100vh - 250px);
 }
 .button{
-    float: right;
-    background-color: #4caf50;
-    color: #ffff;
+  float: right;
+  background-color: #4caf50;
+  color: #ffff;
+  height: 35px;
 }
 th.mat-header-cell, td.mat-cell, td.mat-footer-cell {
    padding: 6px;
--- a/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts
+++ b/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts
@ -47,7 +47,7 @@ const ELEMENT_DATA: UsersData[] = [
 })
 export class UserListComponent implements OnInit {
  push: any;
-  displayedColumns: string[] = ['id','logo', 'role', 'busId','Username', 'mobile_no', 'email', 'status', 'action'];
+  displayedColumns: string[] = ['id','logo', 'role','Username', 'mobile_no', 'email', 'status', 'action'];
  dataSource: any;
  addFormData: any;
  length = 5;
@ -443,4 +443,10 @@ export class UserListComponent implements OnInit {
     this.activeAndInactive = check
     this.getUsersList()
  }
+
+  onToggleChange(event){
+    console.log(event) 
+    this.activeAndInactive = event
+    this.getUsersList()
+   }
 }
--- a/ng-seed/src/app/layouts/admin/admin-layout.component.html
+++ b/ng-seed/src/app/layouts/admin/admin-layout.component.html
@ -22,8 +22,8 @@
                <div class="user-i">
                  <img *ngIf="getUserData.role == 'SADMIN'" src="assets/images/userpic.png" class="rad-full mb-1" width="100" height="100" alt="">
                  <img *ngIf="getUserData.role != 'SADMIN'" [src]="getUserData.logo != '' ? image_view(getUserData.logo) : 'assets/images/userpic.png'" class="rad-full mb-1" width="100" height="100" alt="">
-                  <div> <span>{{getUserData.userName}}</span></div>
-                  <div> <span>{{getUserData.role}}</span></div>
+                  <div> <span class="hed-span text-capitalize">{{getUserData.userName}}</span></div>
+                  <div> <span class="sub-span text-capitalize">- {{roleName}}</span></div>
                </div>
              </div>
              <!-- <div class="most-used text-center">
--- a/ng-seed/src/app/layouts/admin/admin-layout.component.ts
+++ b/ng-seed/src/app/layouts/admin/admin-layout.component.ts
@ -53,6 +53,7 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
  private apiUrl = environment.apiEndpoint;
  getUserData: any = [];
  userLength: any = [];
+  roleName: any;
  constructor(public _con:ConsultantService,private router: Router, public menuItems: MenuItems, public horizontalMenuItems : HorizontalMenuItems, public translate: TranslateService ) {
    const browserLang: string = translate.getBrowserLang();
    translate.use(browserLang.match(/en|fr/) ? browserLang : 'en');
@ -99,7 +100,17 @@ users() {
    this._con.getUsersListDetails(userID).subscribe(res => {
      if (res.status == 200) {
        this.userLength = res.data
-        this.getUserData = res.data[0]
+        this.getUserData = res.data[0] 
+        if(this.getUserData.role == 'PRACTITIONER'){
+           this.roleName = 'Practitioner'
+        }
+        if(this.getUserData.role == 'FRONTDESK'){
+          this.roleName = 'Frontdesk'
+        }
+        if(this.getUserData.role == 'BIZADMIN'){
+          this.roleName = 'Business Admin'
+        }
+
        // this.usersLogo = res.data[0].logo; 
        console.log(this.getUserData)
        let currency = this.getUserData.BusinessDetails[0].currency
--- a/ng-seed/src/app/shared/menu-items/menu-items.ts
+++ b/ng-seed/src/app/shared/menu-items/menu-items.ts
@ -25,7 +25,7 @@ const MENUITEMS : Menu[] = [
    state: 'home',
    name: 'HOME',
    type: 'link',
-    icon: 'explore'
+    icon: 'home'
  },
  {
    state: 'services',
@ -79,12 +79,7 @@ const MENUITEMS : Menu[] = [
  }, 
  
  
-  {
-    state: 'consultant-setting',
-    name: 'Settings',
-    type: 'link',
-    icon: 'settings_system_daydream'
-  },
+ 
  {
    state: 'consultants',
    name: 'Consultants',
@ -102,22 +97,14 @@ const MENUITEMS : Menu[] = [
  },
  {
    state: 'customers',
-    name: 'Customers',
+    name: 'Booking Details',
    type: 'link',
-    icon: 'directions_walk',
-    // children: [
-    //   {state: 'customers-list', name: 'Customers List'},
-    // ]
-  },
-  {
-    state: 'mail-log',
-    name: 'Mail',
-    type: 'link',
-    icon: 'directions_walk',
+    icon: 'event_note',
    // children: [
    //   {state: 'customers-list', name: 'Customers List'},
    // ]
  },
+
  // {
  //   state: 'business-centers',
  //   name: 'Centers',
@ -130,6 +117,20 @@ const MENUITEMS : Menu[] = [
  //   type: 'link',
  //   icon: 'settings_system_daydream'
  // }, 
+  {
+    state: 'consultant-setting',
+    name: 'Settings',
+    type: 'link',
+    icon: 'settings'
+  },  {
+    state: 'mail-log',
+    name: 'Mail',
+    type: 'link',
+    icon: 'email',
+    // children: [
+    //   {state: 'customers-list', name: 'Customers List'},
+    // ]
+  },

 ];

--- a/ng-seed/src/assets/styles/scss/core/_main-sidebar.scss
+++ b/ng-seed/src/assets/styles/scss/core/_main-sidebar.scss
@ -161,11 +161,16 @@
    .user-i {
        z-index: 99;
        position: relative;
-        span {
+        .hed-span {
            font-weight: bold;
-            font-size: 1rem;
+            font-size: 22px;
            padding: 0 0.5rem;
        }
+        .sub-span{
+            // font-weight: bold;
+            font-size: 14px ;
+            padding: 0 0.5rem ;
+        }
    }
    
    .bg-overlay {
--- 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.19:8080/api/',
 // apiEndpoint:'https://api.venbait.in/api/', 
  // apiEndpoint:'http://venbainfotech.com:5000/api/', 
- apiEndpoint:'http://192.168.1.17:8080/api/',
+//  apiEndpoint:'http://192.168.1.17:8080/api/',

-  // apiEndpoint:'https://api.venbait.in/api/',
+  apiEndpoint:'https://api.venbait.in/api/',
  
  //EndUser URL
  endUserUrl: window.location.origin+'/#/customer/',